summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/armish/conf/GENERIC5
-rw-r--r--sys/arch/hppa/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERIC6
-rw-r--r--sys/arch/macppc/conf/GENERIC5
-rw-r--r--sys/arch/sparc64/conf/GENERIC5
-rw-r--r--sys/arch/zaurus/conf/GENERIC5
8 files changed, 24 insertions, 17 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 4d53bf97abc..d355305d031 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.176 2006/07/27 04:40:26 brad Exp $
+# $OpenBSD: GENERIC,v 1.177 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -116,7 +116,8 @@ udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
ugen* at uhub? # USB Generic driver
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
# EV6 Tsunami Core Logic
tsc* at mainbus0
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 7f1a5f5fd82..ca46c2abce2 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.148 2006/08/03 18:19:04 marco Exp $
+# $OpenBSD: GENERIC,v 1.149 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -189,7 +189,8 @@ udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
ugen* at uhub? # USB Generic driver
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
puc* at pci? # PCI "universal" communication device
#puc* at cardbus?
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 0df51048a83..dedb8ee2d62 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.7 2006/06/17 04:45:06 drahn Exp $
+# $OpenBSD: GENERIC,v 1.8 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -135,7 +135,8 @@ udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
ugen* at uhub? # USB Generic driver
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
#udcf* at uhub? # Gude Expert mouseCLOCK
amphy* at mii? # AMD 79C873 PHYs
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 8ad76087462..43acd2598f8 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.85 2006/06/16 05:22:25 marco Exp $
+# $OpenBSD: GENERIC,v 1.86 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -148,7 +148,8 @@ udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
ugen* at uhub? # USB Generic driver
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics
sti0 at phantomas0 irq 11 # builtin graphics on BC*
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7d09fd81dee..c08dbe5249f 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.517 2006/08/06 11:32:35 dlg Exp $
+# $OpenBSD: GENERIC,v 1.518 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -237,8 +237,8 @@ udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
ugen* at uhub? # USB Generic driver
-ural* at uhub? # Ralink RT2500
-#rum* at uhub? # Ralink RT2501
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
zyd* at uhub? # Zydas ZD1211
#option NATM
#ueagle* at uhub? # Analog Devices Eagle ADSL
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 51eff4e90c8..ed94e0f9f7e 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.146 2006/07/31 11:06:22 mickey Exp $g
+# $OpenBSD: GENERIC,v 1.147 2006/08/11 08:51:35 damien Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -260,7 +260,8 @@ udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
#ubt* at uhub? # USB Bluetooth
ugen* at uhub? # USB Generic driver
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
udcf* at uhub? # Gude Expert mouseCLOCK
# I2C bus support
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 7f02e84b3ec..5cf4c8c232e 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.152 2006/07/04 17:10:18 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.153 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -158,7 +158,8 @@ kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
cdce* at uhub? # CDC Ethernet
udav* at uhub? # Davicom DM9601 based Ethernet
upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
url* at uhub? # Realtek RTL8150L based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS
urio* at uhub? # Diamond Multimedia Rio 500
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index a89be76874e..7366f1cf52c 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.50 2006/04/16 20:46:14 miod Exp $
+# $OpenBSD: GENERIC,v 1.51 2006/08/11 08:51:35 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -108,7 +108,8 @@ kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
cdce* at uhub? # CDC Ethernet
upl* at uhub? # Prolific PL2301/PL2302 host-to-host
udav* at uhub? # Davicom DM9601 based Ethernet
-ural* at uhub? # Ralink RT2500
+ural* at uhub? # Ralink RT2500USB
+rum* at uhub? # Ralink RT2501USB/RT2601USB
url* at uhub? # Realtek RTL8150L based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS
urio* at uhub? # Diamond Multimedia Rio 500