Module Name: src
Committed By: jakllsch
Date: Sat Sep 1 18:17:51 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0
src/sys/arch/evbarm/conf: HDL_G HPT5325 MMNET_GENERIC MPCSA_GENERIC
NSLU2 OPENBLOCKS_A6 SHEEVAPLUG
src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT
src/sys/arch/hp700/conf: GENERIC
src/sys/arch/hpcarm/conf: WZERO3
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/sparc64/conf: GENERIC
src/sys/dev/usb: files.usb usbdevices.config
Log Message:
Rename RT2500USB driver to ural(4) as it was originally in OpenBSD,
as ural(4) and ral(4) do not actually share any code.
Enable ural(4) in hpcarm WZERO3 kernel too, as it will now build.
Fixes PR#43520.
To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/HDL_G \
src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/HPT5325 \
src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/NSLU2
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/hp700/conf/GENERIC
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.342 -r1.343 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1078 -r1.1079 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.302 -r1.303 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/usbdevices.config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.362 src/sys/arch/amd64/conf/GENERIC:1.363
--- src/sys/arch/amd64/conf/GENERIC:1.362 Sat Sep 1 15:25:33 2012
+++ src/sys/arch/amd64/conf/GENERIC Sat Sep 1 18:17:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.362 2012/09/01 15:25:33 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.363 2012/09/01 18:17:49 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.362 $"
+#ident "GENERIC-$Revision: 1.363 $"
maxusers 64 # estimated number of users
@@ -964,7 +964,7 @@ uscanner* at uhub? port ?
# USB 802.11 adapters
atu* at uhub? port ? # Atmel at76c50x 802.11b
otus* at uhub? port ? # Atheros AR9001U
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.85 src/sys/arch/amd64/conf/XEN3_DOM0:1.86
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.85 Fri Jun 22 22:38:39 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Sep 1 18:17:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.85 2012/06/22 22:38:39 khorben Exp $
+# $NetBSD: XEN3_DOM0,v 1.86 2012/09/01 18:17:49 jakllsch Exp $
include "arch/amd64/conf/std.xen"
@@ -621,7 +621,7 @@ urndis* at uhub? port ? # Microsoft RND
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.29 src/sys/arch/evbarm/conf/HDL_G:1.30
--- src/sys/arch/evbarm/conf/HDL_G:1.29 Sat Sep 1 14:50:11 2012
+++ src/sys/arch/evbarm/conf/HDL_G Sat Sep 1 18:17:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.29 2012/09/01 14:50:11 matt Exp $
+# $NetBSD: HDL_G,v 1.30 2012/09/01 18:17:49 jakllsch Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -326,7 +326,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11b adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
upl* at uhub? port ?
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.29 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.30
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.29 Tue Jun 5 08:44:09 2012
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Sat Sep 1 18:17:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.29 2012/06/05 08:44:09 abs Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.30 2012/09/01 18:17:49 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32 # estimated number of users
@@ -514,7 +514,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.4 src/sys/arch/evbarm/conf/HPT5325:1.5
--- src/sys/arch/evbarm/conf/HPT5325:1.4 Wed Aug 29 08:29:58 2012
+++ src/sys/arch/evbarm/conf/HPT5325 Sat Sep 1 18:17:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.4 2012/08/29 08:29:58 skrll Exp $
+# $NetBSD: HPT5325,v 1.5 2012/09/01 18:17:49 jakllsch Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -321,7 +321,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.4 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.5
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.4 Wed Aug 29 08:29:58 2012
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.4 2012/08/29 08:29:58 skrll Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.5 2012/09/01 18:17:50 jakllsch Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@@ -273,7 +273,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.6 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.7
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.6 Tue Jun 5 08:44:09 2012
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Sat Sep 1 18:17:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.6 2012/06/05 08:44:09 abs Exp $
+# $NetBSD: MMNET_GENERIC,v 1.7 2012/09/01 18:17:49 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 32 # estimated number of users
@@ -456,7 +456,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
Index: src/sys/arch/evbarm/conf/NSLU2
diff -u src/sys/arch/evbarm/conf/NSLU2:1.25 src/sys/arch/evbarm/conf/NSLU2:1.26
--- src/sys/arch/evbarm/conf/NSLU2:1.25 Sat Sep 1 14:50:11 2012
+++ src/sys/arch/evbarm/conf/NSLU2 Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NSLU2,v 1.25 2012/09/01 14:50:11 matt Exp $
+# $NetBSD: NSLU2,v 1.26 2012/09/01 18:17:50 jakllsch Exp $
#
# Linksys NSLU2 "Slug" NAS Device
#
@@ -217,7 +217,7 @@ ukphy* at mii? phy ? # Generic/Unknown
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
# USB Generic driver
ugen* at uhub? port ? configuration ? interface ?
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.18 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.19
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.18 Wed Aug 29 08:29:59 2012
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.18 2012/08/29 08:29:59 skrll Exp $
+# $NetBSD: SHEEVAPLUG,v 1.19 2012/09/01 18:17:50 jakllsch Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -317,7 +317,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.16 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.17
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.16 Sat Jul 23 21:12:58 2011
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266_OPT,v 1.16 2011/07/23 21:12:58 jakllsch Exp $
+# $NetBSD: OPENBLOCKS266_OPT,v 1.17 2012/09/01 18:17:50 jakllsch Exp $
#
include "arch/evbppc/conf/OPENBLOCKS266"
@@ -219,7 +219,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11b adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/hp700/conf/GENERIC
diff -u src/sys/arch/hp700/conf/GENERIC:1.115 src/sys/arch/hp700/conf/GENERIC:1.116
--- src/sys/arch/hp700/conf/GENERIC:1.115 Tue Jun 5 08:44:11 2012
+++ src/sys/arch/hp700/conf/GENERIC Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115 2012/06/05 08:44:11 abs Exp $
+# $NetBSD: GENERIC,v 1.116 2012/09/01 18:17:50 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.115 $"
+#ident "GENERIC-$Revision: 1.116 $"
maxusers 32 # estimated number of users
@@ -635,7 +635,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.26 src/sys/arch/hpcarm/conf/WZERO3:1.27
--- src/sys/arch/hpcarm/conf/WZERO3:1.26 Fri Aug 17 19:43:25 2012
+++ src/sys/arch/hpcarm/conf/WZERO3 Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: WZERO3,v 1.26 2012/08/17 19:43:25 abs Exp $
+# $NetBSD: WZERO3,v 1.27 2012/09/01 18:17:50 jakllsch Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.26 $"
+#ident "GENERIC-$Revision: 1.27 $"
# estimated number of users
maxusers 32
@@ -255,7 +255,7 @@ urlphy* at mii? phy ? # Realtek RTL8150
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-#ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
upgt* at uhub? port ? # Intersil PrismGT
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.342 src/sys/arch/i386/conf/ALL:1.343
--- src/sys/arch/i386/conf/ALL:1.342 Sat Aug 4 04:39:40 2012
+++ src/sys/arch/i386/conf/ALL Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.342 2012/08/04 04:39:40 riastradh Exp $
+# $NetBSD: ALL,v 1.343 2012/09/01 18:17:50 jakllsch Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.342 $"
+#ident "ALL-$Revision: 1.343 $"
maxusers 64 # estimated number of users
@@ -1274,7 +1274,7 @@ urndis* at uhub? port ? # Microsoft RND
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
upgt* at uhub? port ? # Intersil PrismGT
zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1078 src/sys/arch/i386/conf/GENERIC:1.1079
--- src/sys/arch/i386/conf/GENERIC:1.1078 Fri Aug 10 11:32:32 2012
+++ src/sys/arch/i386/conf/GENERIC Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1078 2012/08/10 11:32:32 sborrill Exp $
+# $NetBSD: GENERIC,v 1.1079 2012/09/01 18:17:50 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1078 $"
+#ident "GENERIC-$Revision: 1.1079 $"
maxusers 64 # estimated number of users
@@ -1230,7 +1230,7 @@ urndis* at uhub? port ? # Microsoft RND
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
upgt* at uhub? port ? # Intersil PrismGT
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.67 src/sys/arch/i386/conf/XEN3_DOM0:1.68
--- src/sys/arch/i386/conf/XEN3_DOM0:1.67 Tue Jun 5 08:44:13 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.67 2012/06/05 08:44:13 abs Exp $
+# $NetBSD: XEN3_DOM0,v 1.68 2012/09/01 18:17:50 jakllsch Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -599,7 +599,7 @@ urndis* at uhub? port ? # Microsoft RND
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.71 src/sys/arch/iyonix/conf/GENERIC:1.72
--- src/sys/arch/iyonix/conf/GENERIC:1.71 Fri Aug 17 20:11:40 2012
+++ src/sys/arch/iyonix/conf/GENERIC Sat Sep 1 18:17:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.71 2012/08/17 20:11:40 abs Exp $
+# $NetBSD: GENERIC,v 1.72 2012/09/01 18:17:50 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.71 $"
+#ident "GENERIC-$Revision: 1.72 $"
maxusers 32 # estimated number of users
@@ -596,7 +596,7 @@ uaudio* at uhub? port ? configuration ?
# USB 802.11 adapters
#atu* at uhub? port ? # Atmel AT76C50XX based adapters
-#ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+#ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
#rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.31 src/sys/arch/landisk/conf/GENERIC:1.32
--- src/sys/arch/landisk/conf/GENERIC:1.31 Sat Mar 10 21:51:53 2012
+++ src/sys/arch/landisk/conf/GENERIC Sat Sep 1 18:17:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.31 2012/03/10 21:51:53 joerg Exp $
+# $NetBSD: GENERIC,v 1.32 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.31 $"
+#ident "GENERIC-$Revision: 1.32 $"
maxusers 16 # estimated number of users
@@ -338,7 +338,7 @@ cdce* at uhub? port ? # CDC, Ethernet N
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
udav* at uhub? port ? # Davicom DM9601 based adapters
-ral* at uhub? port ? #
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11b adapters
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.302 src/sys/arch/macppc/conf/GENERIC:1.303
--- src/sys/arch/macppc/conf/GENERIC:1.302 Fri Aug 17 20:11:40 2012
+++ src/sys/arch/macppc/conf/GENERIC Sat Sep 1 18:17:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.302 2012/08/17 20:11:40 abs Exp $
+# $NetBSD: GENERIC,v 1.303 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.302 $"
+#ident "GENERIC-$Revision: 1.303 $"
maxusers 32
@@ -530,7 +530,7 @@ ugen* at uhub? port ? configuration ? in
# USB 802.11 adapters
atu* at uhub? port ? # Atmel at76c50x 802.11b
otus* at uhub? port ? # Atheros AR9001U
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.142 src/sys/arch/ofppc/conf/GENERIC:1.143
--- src/sys/arch/ofppc/conf/GENERIC:1.142 Fri Aug 17 20:11:41 2012
+++ src/sys/arch/ofppc/conf/GENERIC Sat Sep 1 18:17:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2012/08/17 20:11:41 abs Exp $
+# $NetBSD: GENERIC,v 1.143 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.142 $"
+#ident "GENERIC-$Revision: 1.143 $"
maxusers 32
@@ -387,7 +387,7 @@ ugen* at uhub? port ? configuration ? in
# USB 802.11 adapters
#atu* at uhub? port ? # Atmel at76c50x 802.11b
-#ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+#ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211
# PCI IEEE1394 controllers
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.151 src/sys/arch/sparc64/conf/GENERIC:1.152
--- src/sys/arch/sparc64/conf/GENERIC:1.151 Tue Jun 5 08:44:16 2012
+++ src/sys/arch/sparc64/conf/GENERIC Sat Sep 1 18:17:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.151 2012/06/05 08:44:16 abs Exp $
+# $NetBSD: GENERIC,v 1.152 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.151 $"
+#ident "GENERIC-$Revision: 1.152 $"
maxusers 64
@@ -630,7 +630,7 @@ url* at uhub? port ? # Realtek RTL8150L
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211
# Prolific PL2301/PL2302 host-to-host adapter
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.124 src/sys/dev/usb/files.usb:1.125
--- src/sys/dev/usb/files.usb:1.124 Sat Aug 4 04:34:54 2012
+++ src/sys/dev/usb/files.usb Sat Sep 1 18:17:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.124 2012/08/04 04:34:54 riastradh Exp $
+# $NetBSD: files.usb,v 1.125 2012/09/01 18:17:51 jakllsch Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -379,7 +379,8 @@ attach upgt at usbdevif
file dev/usb/if_upgt.c upgt
# Ralink Technology RT2500USB
-attach ral at usbdevif with ural
+device ural: arp, ether, ifnet, wlan, firmload
+attach ural at usbdevif
file dev/usb/if_ural.c ural
device rum: ether, ifnet, arp, wlan, firmload
Index: src/sys/dev/usb/usbdevices.config
diff -u src/sys/dev/usb/usbdevices.config:1.15 src/sys/dev/usb/usbdevices.config:1.16
--- src/sys/dev/usb/usbdevices.config:1.15 Sat Sep 1 17:36:07 2012
+++ src/sys/dev/usb/usbdevices.config Sat Sep 1 18:17:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: usbdevices.config,v 1.15 2012/09/01 17:36:07 jakllsch Exp $
+# $NetBSD: usbdevices.config,v 1.16 2012/09/01 18:17:51 jakllsch Exp $
#
# This file contains all USB related configuration.
# It is suitable for inclusion in a kernel config(5) file.
@@ -113,7 +113,7 @@ urndis* at uhub? port ? # Microsoft RND
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
-ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
upgt* at uhub? port ? # Intersil PrismGT
