From 6e3471bd0bcd4c44e2e9390c18a43532a71b6998 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 14 May 2015 20:19:22 +0000 Subject: [PATCH] Add nvme and nvd drivers to GENERIC for amd64 and i386. MFC after: 3 days Sponsored by: Intel --- sys/amd64/conf/GENERIC | 4 ++++ sys/i386/conf/GENERIC | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 3840ec51f08..3d2cc39c635 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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 26d87d121b8..d1d2a2f457b 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -177,6 +177,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 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