svn commit: r283076 - in stable/10/sys: amd64/conf i386/conf

[Jim Harris]

Author: jimharris
Date: Mon May 18 19:48:41 2015
New Revision: 283076
URL: https://svnweb.freebsd.org/changeset/base/283076

Log:
  MFC r282921:
  
    Add nvme and nvd drivers to GENERIC for amd64 and i386.
  
  Sponsored by:	Intel

Modified:
  stable/10/sys/amd64/conf/GENERIC
  stable/10/sys/i386/conf/GENERIC
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC	Mon May 18 19:45:46 2015	(r283075)
+++ stable/10/sys/amd64/conf/GENERIC	Mon May 18 19:48:41 2015	(r283076)
@@ -161,6 +161,10 @@ device		mrsas			# LSI/Avago MegaRAID SAS
 #device		pst			# Promise Supertrak SX6000
 device		twe			# 3ware ATA RAID
 
+# NVM Express (NVMe) support
+device		nvme			# base NVMe driver
+device		nvd			# expose NVMe namespaces as disks, depends on nvme
+
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device		atkbdc			# AT keyboard controller
 device		atkbd			# AT keyboard

Modified: stable/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC	Mon May 18 19:45:46 2015	(r283075)
+++ stable/10/sys/i386/conf/GENERIC	Mon May 18 19:48:41 2015	(r283076)
@@ -166,6 +166,10 @@ device		mrsas			# LSI/Avago MegaRAID SAS
 device		pst			# Promise Supertrak SX6000
 device		twe			# 3ware ATA RAID
 
+# NVM Express (NVMe) support
+device		nvme			# base NVMe driver
+device		nvd			# expose NVMe namespace as disks, depends on nvme
+
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device		atkbdc			# AT keyboard controller
 device		atkbd			# AT keyboard