diff options
| author | jimharris <jimharris@FreeBSD.org> | 2015-05-18 19:48:41 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2015-05-18 19:48:41 +0000 |
| commit | 1901626e0109ee5d20265b9a9a176e7131a70a99 (patch) | |
| tree | 54e3620699385a1d643bc4e69a86ed869fcf30e6 /sys | |
| parent | 4fde1f4b3850815eb902587349f98dc5612e62f4 (diff) | |
| download | FreeBSD-src-1901626e0109ee5d20265b9a9a176e7131a70a99.zip FreeBSD-src-1901626e0109ee5d20265b9a9a176e7131a70a99.tar.gz | |
MFC r282921:
Add nvme and nvd drivers to GENERIC for amd64 and i386.
Sponsored by: Intel
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 03a0f9f..7955824 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 4ec939a..52ea39c 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 |
