summaryrefslogtreecommitdiff
path: root/sys/arch/socppc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-11-19 20:54:53 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-11-19 20:54:53 +0000
commit6a986e8479d7aaf39bf85f818e98abdcdebf9fae (patch)
tree81336b7f07c02ed1d6332924ee12ec5d4bef8512 /sys/arch/socppc
parent74a0cacf668913a1239d02e3d4bd8368702ff7f9 (diff)
Sync usb device list with macppc.
Diffstat (limited to 'sys/arch/socppc')
-rw-r--r--sys/arch/socppc/conf/GENERIC10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC
index a680b6ef970..85b6726af4a 100644
--- a/sys/arch/socppc/conf/GENERIC
+++ b/sys/arch/socppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.16 2010/11/15 19:07:34 damien Exp $
+# $OpenBSD: GENERIC,v 1.17 2010/11/19 20:54:52 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -61,6 +61,7 @@ usb* at ehci?
# USB devices
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
+ulpt* at uhub? # USB Printers
umass* at uhub? # USB Mass Storage devices
scsibus* at umass?
uhidev* at uhub? # Human Interface Devices
@@ -77,6 +78,9 @@ rum* at uhub? # Ralink RT2501USB/RT2601USB
run* at uhub? # Ralink RT2700U/RT2800U/RT3000U
urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU
zyd* at uhub? # Zydas ZD1211
+urio* at uhub? # Diamond Multimedia Rio 500
+uscanner* at uhub? # USB Scanners
+ugen* at uhub? # USB Generic driver
uthum* at uhidev? # TEMPerHUM sensor
utwitch* at uhidev? # YUREX BBU sensor
@@ -99,5 +103,5 @@ ukphy* at mii? # Generic unknown PHY
# PCI
athn* at pci? # Atheros AR9k (802.11a/g/n)
-# mouse & keyboard multiplexor pseudo-devices
-pseudo-device wsmux 2
+pseudo-device hotplug 1 # devices hot plugging
+pseudo-device wsmux 2 # mouse & keyboard multiplexor