summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
3 files changed, 3 insertions, 10 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index c6b26ccd4bc..d72c1e2be8b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.291 2010/07/03 01:02:25 mlarkin Exp $
+# $OpenBSD: GENERIC,v 1.292 2010/07/03 03:59:16 krw Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -225,8 +225,6 @@ url* at uhub? # Realtek RTL8150L based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS
urio* at uhub? # Diamond Multimedia Rio 500
uscanner* at uhub? # USB Scanners
-usscanner* at uhub? # USB SCSI scanners, e.g., HP5300
-scsibus* at usscanner?
#uyap* at uhub? # Y@P firmware loader
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
@@ -388,7 +386,6 @@ sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
cd* at scsibus? # SCSI CD-ROM drives
ch* at scsibus? # SCSI autochangers
-ss* at scsibus? # SCSI scanners
safte* at scsibus? # SCSI accessed fault-tolerant encl
ses* at scsibus? # SCSI enclosure services
uk* at scsibus? # unknown SCSI
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index e2dedbd730a..04adcc08dd9 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.49 2009/01/13 13:53:50 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.50 2010/07/03 03:59:16 krw Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -107,8 +107,6 @@ wskbd* at ukbd? mux 1
#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
#urio* at uhub? # Diamond Multimedia Rio 500
#uscanner* at uhub? # USB Scanners
-#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300
-#scsibus* at usscanner?
#uyap* at uhub? # Y@P firmware loader
#ugen* at uhub? # USB Generic driver
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 7509080fe50..23ba4f17899 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.113 2010/04/06 03:55:47 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.114 2010/07/03 03:59:16 krw Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -118,8 +118,6 @@ wi* at uhub? # WaveLAN IEEE 802.11DS
upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
#urio* at uhub? # Diamond Multimedia Rio 500
#uscanner* at uhub? # USB Scanners
-#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300
-#scsibus* at usscanner?
#uyap* at uhub? # Y@P firmware loader
#ugen* at uhub? # USB Generic driver
ural* at uhub? # Ralink RT2500