From 81a6bc88a1e76e2690e7ef613023a10ef94b028c Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 18 May 2015 19:48:41 +0000 Subject: [PATCH] MFC r282921: Add nvme and nvd drivers to GENERIC for amd64 and i386. 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 03a0f9fc032f..795582459c81 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -161,6 +161,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 4ec939ab8825..52ea39c26b00 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -166,6 +166,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