From a724927cf3aa5ee3a73d85a6633c15909d2bffc3 Mon Sep 17 00:00:00 2001
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 17 Sep 2012 21:41:38 +0000
Subject: [PATCH] Integrate nvmecontrol(8) into the amd64 and i386 builds.

This includes adding NVMe header files to /usr/include/dev/nvme.

Sponsored by:  Intel
---
 etc/mtree/BSD.include.dist | 2 ++
 include/Makefile           | 4 ++--
 sbin/Makefile.amd64        | 1 +
 sbin/Makefile.i386         | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 7e6251f32526..3d918a73017f 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -126,6 +126,8 @@
         ..
         nand
         ..
+        nvme
+        ..
         ofw
         ..
         pbio
diff --git a/include/Makefile b/include/Makefile
index 3555831531ef..573a66159899 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -40,8 +40,8 @@ LDIRS=	bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
 
 LSUBDIRS=	cam/ata cam/scsi \
 	dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \
-	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \
+	dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64
index 2d231b0cb2b0..d3cf350ee2cc 100644
--- a/sbin/Makefile.amd64
+++ b/sbin/Makefile.amd64
@@ -2,3 +2,4 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol
diff --git a/sbin/Makefile.i386 b/sbin/Makefile.i386
index 4135c44082c9..0ced312832f8 100644
--- a/sbin/Makefile.i386
+++ b/sbin/Makefile.i386
@@ -2,4 +2,5 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol
 SUBDIR += sconfig