diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-04-15 05:52:14 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-04-15 05:52:14 +0000 |
| commit | 4204f05144606464d2cee503a99234d806abc97f (patch) | |
| tree | 73bbd3522532a9151e1c50cfa3f0ea1f2f772cac /sys/arch/amd64 | |
| parent | 754923eb061ab7a49261e9a5c44fd9de91f4fb5f (diff) | |
enable nvme(4)
ok dlg@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 76309799566..63a05bc32f1 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.415 2016/03/28 17:54:37 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.416 2016/04/15 05:52:13 jsg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -388,6 +388,7 @@ adw* at pci? # AdvanSys ULTRA WIDE SCSI pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #trm* at pci? # Tekram DC-3x5U SCSI Controllers vmwpvs* at pci? # VMware ParaVirtual SCSI +nvme* at pci? # NVMe controllers scsibus* at scsi? sd* at scsibus? # SCSI disk drives diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index c8eca0cc963..79fc268e531 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.160 2016/03/29 02:49:57 jsg Exp $ +# $OpenBSD: RAMDISK_CD,v 1.161 2016/04/15 05:52:13 jsg Exp $ machine amd64 maxusers 4 @@ -158,6 +158,7 @@ siop* at pci? # NCR 538XX SCSI controllers(new) adw* at pci? # AdvanSys ULTRA WIDE SCSI pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI vmwpvs* at pci? # VMware ParaVirtual SCSI +nvme* at pci? # NVMe controllers softraid0 at root scsibus* at scsi? |