Module Name: src
Committed By: jdolecek
Date: Sat Sep 17 18:37:46 UTC 2016
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
add nvme(4)
To generate a diff of this commit:
cvs rdiff -u -r1.1139 -r1.1140 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1139 src/sys/arch/i386/conf/GENERIC:1.1140
--- src/sys/arch/i386/conf/GENERIC:1.1139 Sun Aug 7 10:44:05 2016
+++ src/sys/arch/i386/conf/GENERIC Sat Sep 17 18:37:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1139 2016/08/07 10:44:05 christos Exp $
+# $NetBSD: GENERIC,v 1.1140 2016/09/17 18:37:46 jdolecek Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1139 $"
+#ident "GENERIC-$Revision: 1.1140 $"
maxusers 64 # estimated number of users
@@ -835,6 +835,9 @@ ses* at scsibus? target ? lun ? # SCSI E
ss* at scsibus? target ? lun ? # SCSI scanners
uk* at scsibus? target ? lun ? # SCSI unknown
+# NVM Express controllers and devices
+nvme* at pci? dev ? function ?
+ld* at nvme? nsid ?
# RAID controllers and devices
aac* at pci? dev ? function ? # Adaptec AAC family
