summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf
diff options
context:
space:
mode:
authorjimharris <jimharris@FreeBSD.org>2015-05-14 20:19:22 +0000
committerjimharris <jimharris@FreeBSD.org>2015-05-14 20:19:22 +0000
commit32fd2595135d93f20fc8f390af020262ca99fe6d (patch)
tree7cb492baf3f6941145c204259863ce74e1844031 /sys/amd64/conf
parentb8b309799ad445a849e85bc3be7d800295be9cc2 (diff)
downloadFreeBSD-src-32fd2595135d93f20fc8f390af020262ca99fe6d.zip
FreeBSD-src-32fd2595135d93f20fc8f390af020262ca99fe6d.tar.gz
Add nvme and nvd drivers to GENERIC for amd64 and i386.
MFC after: 3 days Sponsored by: Intel
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r--sys/amd64/conf/GENERIC4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3840ec5..3d2cc39 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -173,6 +173,10 @@ device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
#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
OpenPOWER on IntegriCloud