From c2d9fe68ab520e6cc5e22f37c32fe4998877bec9 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 22 Feb 2014 22:09:52 +0100
Subject: [PATCH] kernel: Build and install nata(4) modules too.

Reported-by:   tuxillo
Dragonfly-bug: <http://bugs.dragonflybsd.org/issues/2642>
---
 share/man/man4/nata.4      | 22 +++++++++++++++++++++-
 share/man/man4/nataraid.4  | 14 +++++++++++++-
 sys/dev/disk/Makefile      |  2 +-
 sys/dev/disk/nata/Makefile |  3 +--
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/share/man/man4/nata.4 b/share/man/man4/nata.4
index 1f59339406..fb602dade4 100644
--- a/share/man/man4/nata.4
+++ b/share/man/man4/nata.4
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/ata.4,v 1.72 2007/03/10 12:44:22 brueffer Exp $
 .\"
-.Dd January 1, 2008
+.Dd February 22, 2014
 .Dt NATA 4
 .Os
 .Sh NAME
@@ -38,6 +38,10 @@
 .Nm ast
 .Nd generic ATA/ATAPI disk controller driver
 .Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
 For ISA based ATA/ATAPI support:
 .Cd device isa
 .Cd device nata0 at isa? port IO_WD1 irq 14
@@ -61,6 +65,22 @@ To support ATAPI floppy drives:
 .Pp
 To support ATAPI tape drives:
 .Cd device natapist
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+nata_load="YES"
+natacard_load="YES"
+natadisk_load="YES"
+nataisa_load="YES"
+natapci_load="YES"
+natapicd_load="YES"
+natapifd_load="YES"
+natapist_load="YES"
+natausb_load="YES"
+.Ed
 .Pp
 The following tunables are settable from the loader:
 .Bl -ohang
diff --git a/share/man/man4/nataraid.4 b/share/man/man4/nataraid.4
index 917e4449ac..325dc7d5c1 100644
--- a/share/man/man4/nataraid.4
+++ b/share/man/man4/nataraid.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/ataraid.4,v 1.10 2006/09/18 15:24:18 ru Exp $
 .\"
-.Dd June 24, 2007
+.Dd February 22, 2014
 .Dt NATARAID 4
 .Os
 .Sh NAME
@@ -32,8 +32,20 @@
 .Nm ar
 .Nd "ATA software RAID support"
 .Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
 .Cd "device nata"
 .Cd "device nataraid"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+nataraid_load="YES"
+.Ed
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/sys/dev/disk/Makefile b/sys/dev/disk/Makefile
index ca649a2505..b9c2346b80 100644
--- a/sys/dev/disk/Makefile
+++ b/sys/dev/disk/Makefile
@@ -1,6 +1,6 @@
 .include "${.CURDIR}/../../platform/${MACHINE_PLATFORM}/Makefile.inc"
 
-SUBDIR= ahci aic aic7xxx ccd dm iscsi isp ispfw md mmcsd mpt ncv nsp
+SUBDIR= ahci aic aic7xxx ccd dm iscsi isp ispfw md mmcsd mpt nata ncv nsp
 SUBDIR+= sbp sdhci sili stg sym trm vn vpo
 
 .for dir in ${SUBDIR}
diff --git a/sys/dev/disk/nata/Makefile b/sys/dev/disk/nata/Makefile
index 04884df4c6..0e7153a7b8 100644
--- a/sys/dev/disk/nata/Makefile
+++ b/sys/dev/disk/nata/Makefile
@@ -1,6 +1,5 @@
 SUBDIR=		nata natacard natadisk nataisa natapci natapicd natapifd \
-		natapist natapicam
-#SUBDIR+=	nataraid
+		natapist natapicam nataraid
 
 .if !defined(WANT_USB4BSD)
 SUBDIR+=	natausb
-- 
2.41.0