summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-11-19 20:54:13 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-11-19 20:54:13 +0000
commit74a0cacf668913a1239d02e3d4bd8368702ff7f9 (patch)
tree2f4eb396ad04573b72768d51d037db886735d4b7 /sys
parenta4121cd4171c201cd34c46c7c33d332af984c300 (diff)
Add urio, uscanner and pseudo-device hotplug.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP276
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP306
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP327
3 files changed, 15 insertions, 4 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index b99ac89c290..af5e0e54a79 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.37 2010/09/24 01:48:03 yuo Exp $
+# $OpenBSD: GENERIC-IP27,v 1.38 2010/11/19 20:54:12 miod Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -114,6 +114,8 @@ umass* at uhub? # USB Mass Storage devices
atapiscsi* at umass?
scsibus* at atapiscsi?
scsibus* at umass?
+urio* at uhub? # Diamond Multimedia Rio 500
+uscanner* at uhub? # USB Scanners
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
@@ -253,3 +255,5 @@ com* at puc?
#lpt* at puc?
pseudo-device crypto 1
+pseudo-device hotplug 1 # devices hot plugging
+pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index fc8573358c6..d15eb39e8e6 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.31 2010/09/24 01:48:03 yuo Exp $
+# $OpenBSD: GENERIC-IP30,v 1.32 2010/11/19 20:54:12 miod Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -106,6 +106,8 @@ umass* at uhub? # USB Mass Storage devices
atapiscsi* at umass?
scsibus* at atapiscsi?
scsibus* at umass?
+urio* at uhub? # Diamond Multimedia Rio 500
+uscanner* at uhub? # USB Scanners
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
@@ -245,3 +247,5 @@ com* at puc?
#lpt* at puc?
pseudo-device crypto 1
+pseudo-device hotplug 1 # devices hot plugging
+pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index ce24e554487..3e04503b2d8 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP32,v 1.22 2010/09/24 01:48:03 yuo Exp $
+# $OpenBSD: GENERIC-IP32,v 1.23 2010/11/19 20:54:12 miod Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
#
@@ -98,6 +98,8 @@ umass* at uhub? # USB Mass Storage devices
atapiscsi* at umass?
scsibus* at atapiscsi?
scsibus* at umass?
+urio* at uhub? # Diamond Multimedia Rio 500
+uscanner* at uhub? # USB Scanners
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
@@ -240,5 +242,6 @@ puc* at pci?
com* at puc?
#lpt* at puc?
-pseudo-device wsmux 2 # Mouse and keyboard multiplexor
pseudo-device crypto 1
+pseudo-device hotplug 1 # devices hot plugging
+pseudo-device wsmux 2 # Mouse and keyboard multiplexor