From ec5ba907967a94e7f0f9a3eb94c320bcf20a60d0 Mon Sep 17 00:00:00 2001
From: jakllsch <jakllsch@NetBSD.org>
Date: Sat, 1 Sep 2012 18:17:49 +0000
Subject: [PATCH] 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.
---
 sys/arch/amd64/conf/GENERIC            | 6 +++---
 sys/arch/amd64/conf/XEN3_DOM0          | 4 ++--
 sys/arch/evbarm/conf/HDL_G             | 4 ++--
 sys/arch/evbarm/conf/HPT5325           | 4 ++--
 sys/arch/evbarm/conf/MMNET_GENERIC     | 6 +++---
 sys/arch/evbarm/conf/MPCSA_GENERIC     | 6 +++---
 sys/arch/evbarm/conf/NSLU2             | 4 ++--
 sys/arch/evbarm/conf/OPENBLOCKS_A6     | 4 ++--
 sys/arch/evbarm/conf/SHEEVAPLUG        | 4 ++--
 sys/arch/evbppc/conf/OPENBLOCKS266_OPT | 4 ++--
 sys/arch/hp700/conf/GENERIC            | 6 +++---
 sys/arch/hpcarm/conf/WZERO3            | 6 +++---
 sys/arch/i386/conf/ALL                 | 6 +++---
 sys/arch/i386/conf/GENERIC             | 6 +++---
 sys/arch/i386/conf/XEN3_DOM0           | 4 ++--
 sys/arch/iyonix/conf/GENERIC           | 6 +++---
 sys/arch/landisk/conf/GENERIC          | 6 +++---
 sys/arch/macppc/conf/GENERIC           | 6 +++---
 sys/arch/ofppc/conf/GENERIC            | 6 +++---
 sys/arch/sparc64/conf/GENERIC          | 6 +++---
 sys/dev/usb/files.usb                  | 5 +++--
 sys/dev/usb/usbdevices.config          | 4 ++--
 22 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e5f35d73f5b4..cc0c4eb7e6a4 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -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
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 730522daed2a..9b3322c2fe76 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -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 RNDIS specification
 
 # 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
diff --git a/sys/arch/evbarm/conf/HDL_G b/sys/arch/evbarm/conf/HDL_G
index c7fafe9d444f..5ce3c1ed08f4 100644
--- a/sys/arch/evbarm/conf/HDL_G
+++ b/sys/arch/evbarm/conf/HDL_G
@@ -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 based adapters
 
 # 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 ?
diff --git a/sys/arch/evbarm/conf/HPT5325 b/sys/arch/evbarm/conf/HPT5325
index 7c1713dba4b1..eff1d62c400e 100644
--- a/sys/arch/evbarm/conf/HPT5325
+++ b/sys/arch/evbarm/conf/HPT5325
@@ -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 based adapters
 
 # 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
 
diff --git a/sys/arch/evbarm/conf/MMNET_GENERIC b/sys/arch/evbarm/conf/MMNET_GENERIC
index 07add10fff75..36974b5a3930 100644
--- a/sys/arch/evbarm/conf/MMNET_GENERIC
+++ b/sys/arch/evbarm/conf/MMNET_GENERIC
@@ -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 based adapters
 
 # 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
diff --git a/sys/arch/evbarm/conf/MPCSA_GENERIC b/sys/arch/evbarm/conf/MPCSA_GENERIC
index ff07b94bb3af..1808e0152b7d 100644
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC
@@ -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 based adapters
 
 # 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
diff --git a/sys/arch/evbarm/conf/NSLU2 b/sys/arch/evbarm/conf/NSLU2
index 01f71b6633ed..643d8957cffd 100644
--- a/sys/arch/evbarm/conf/NSLU2
+++ b/sys/arch/evbarm/conf/NSLU2
@@ -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 PHY
 
 # 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 ?
diff --git a/sys/arch/evbarm/conf/OPENBLOCKS_A6 b/sys/arch/evbarm/conf/OPENBLOCKS_A6
index e805f5bb720e..2818ef1430aa 100644
--- a/sys/arch/evbarm/conf/OPENBLOCKS_A6
+++ b/sys/arch/evbarm/conf/OPENBLOCKS_A6
@@ -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 based adapters
 
 # 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
 
diff --git a/sys/arch/evbarm/conf/SHEEVAPLUG b/sys/arch/evbarm/conf/SHEEVAPLUG
index d334faace4d6..d856fa15cae0 100644
--- a/sys/arch/evbarm/conf/SHEEVAPLUG
+++ b/sys/arch/evbarm/conf/SHEEVAPLUG
@@ -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 based adapters
 
 # 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
 
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266_OPT b/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
index 44f6e796fb4b..206afd7df24b 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
@@ -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 based adapters
 
 # 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
 
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index 220a5bccb8da..918fd89f6515 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -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 based adapters
 
 # 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
 
diff --git a/sys/arch/hpcarm/conf/WZERO3 b/sys/arch/hpcarm/conf/WZERO3
index 4c1af0f0b84e..1e796f21eacc 100644
--- a/sys/arch/hpcarm/conf/WZERO3
+++ b/sys/arch/hpcarm/conf/WZERO3
@@ -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 RTL8150L internal PHYs
 
 # 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
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 287904232323..f1b49ad37fa7 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -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 RNDIS specification
 # 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
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b18b073fcc2a..061a4f592aa8 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -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 RNDIS specification
 # 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
diff --git a/sys/arch/i386/conf/XEN3_DOM0 b/sys/arch/i386/conf/XEN3_DOM0
index 6ee76c11fa84..ac40d3ec9b47 100644
--- a/sys/arch/i386/conf/XEN3_DOM0
+++ b/sys/arch/i386/conf/XEN3_DOM0
@@ -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 RNDIS specification
 
 # 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
diff --git a/sys/arch/iyonix/conf/GENERIC b/sys/arch/iyonix/conf/GENERIC
index de4062441d1e..5b4d37d24422 100644
--- a/sys/arch/iyonix/conf/GENERIC
+++ b/sys/arch/iyonix/conf/GENERIC
@@ -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
 
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 8f11c034774d..3b1d16c8fd7c 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -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 Networking Control Model
 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
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 4a34969219cf..5268a09512f9 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -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 ? interface ?	# USB Generic driver
 # 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
 
diff --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC
index f6c5eeadb8a3..8f2417298df0 100644
--- a/sys/arch/ofppc/conf/GENERIC
+++ b/sys/arch/ofppc/conf/GENERIC
@@ -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 ? interface ?	# USB Generic driver
 
 # 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
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 086c022bd80e..d10733d94a69 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -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 based adapters
 
 # 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
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index e5385aaf5068..8014a495ac87 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -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
diff --git a/sys/dev/usb/usbdevices.config b/sys/dev/usb/usbdevices.config
index 99bf12f20eb5..57220f4ae684 100644
--- a/sys/dev/usb/usbdevices.config
+++ b/sys/dev/usb/usbdevices.config
@@ -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 RNDIS specification
 # 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