summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-11-27 12:35:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-11-27 12:35:31 +0000
commitd8bd24a1de7ac0837175fc60bd5cb1334d3fc2f6 (patch)
treed2bd06c40dac7efc3b4fbbed387fd0fba5d652ab
parent840004135aa5ae51a122a1f689d6726b5c2e45ff (diff)
move uberry to a nicer place
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 24775cf646b..92244675134 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.167 2006/11/26 16:11:19 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.168 2006/11/27 12:35:30 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -194,6 +194,7 @@ scsibus* at usscanner?
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
+uberry* at uhub? # Research In Motion Blackberry
ugen* at uhub? # USB Generic driver
uath* at uhub? # Atheros AR5005UG/AR5005UX
ural* at uhub? # Ralink RT2500USB
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f36087f4a29..3e22d082433 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.538 2006/11/27 11:39:26 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.539 2006/11/27 12:35:29 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -227,7 +227,6 @@ ucycom* at uhidev? # Cypress serial
ucom* at ucycom?
uhid* at uhidev? # USB generic HID support
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
-uberry* at uhub? # Research In Motion Blackberry
atu* at uhub? # Atmel AT76c50x based 802.11b
axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
cue* at uhub? # CATC USB-EL1201A based Ethernet
@@ -245,6 +244,7 @@ scsibus* at usscanner?
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
+uberry* at uhub? # Research In Motion Blackberry
ugen* at uhub? # USB Generic driver
uath* at uhub? # Atheros AR5005UG/AR5005UX
ural* at uhub? # Ralink RT2500USB