summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64/conf
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-04-15 01:40:26 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-04-15 01:40:26 +0000
commitcee03e85621bb0886bf3f7dcec324b3af6e07f82 (patch)
tree35b62d38c643b4040df8ba71f6d8f26955e94752 /sys/arch/sparc64/conf
parenta0f78ab96a447153ec0454e2c633ba53d1c041d8 (diff)
enable nvme(4). it Just Works(tm).
Diffstat (limited to 'sys/arch/sparc64/conf')
-rw-r--r--sys/arch/sparc64/conf/GENERIC3
-rw-r--r--sys/arch/sparc64/conf/RAMDISK3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index e9161ed91a8..777ffe7aa06 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.302 2016/04/10 19:16:16 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.303 2016/04/15 01:40:25 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -126,6 +126,7 @@ pciide* at jmb?
ahci* at pci? flags 0x0000 # AHCI SATA controllers
# flags 0x0001 to force SATA 1 (1.5Gb/s)
sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers
+nvme* at pci? # NVMe controllers
# PCI crypto
hifn* at pci? # Hifn 7751/7811/7951
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 955f592ba23..70c46cafb68 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.118 2015/07/17 22:52:29 tedu Exp $
+# $OpenBSD: RAMDISK,v 1.119 2016/04/15 01:40:25 dlg Exp $
machine sparc64
maxusers 4
@@ -168,6 +168,7 @@ jmb* at pci?
ahci* at jmb?
pciide* at jmb?
ahci* at pci?
+nvme* at pci?
scsibus* at scsi?
sd* at scsibus? # SCSI disks