svn commit: r199397 - in stable/7/sys: amd64/conf i386/conf pc98/conf

[John Baldwin]

Author: jhb
Date: Tue Nov 17 15:59:26 2009
New Revision: 199397
URL: http://svn.freebsd.org/changeset/base/199397

Log:
  MFC 198043:
  Move the USB wireless drivers down into their own section next to the USB
  ethernet drivers.

Modified:
  stable/7/sys/amd64/conf/GENERIC
  stable/7/sys/i386/conf/GENERIC
  stable/7/sys/pc98/conf/GENERIC
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/conf/GENERIC
==============================================================================
--- stable/7/sys/amd64/conf/GENERIC	Tue Nov 17 15:56:45 2009	(r199396)
+++ stable/7/sys/amd64/conf/GENERIC	Tue Nov 17 15:59:26 2009	(r199397)
@@ -280,7 +280,6 @@ device		ukbd		# Keyboard
 device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
-device		ural		# Ralink Technology RT2500USB wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
 device		uscanner	# Scanners
 # USB Serial devices
@@ -301,6 +300,9 @@ device		cdce		# Generic USB over Etherne
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 device		rue		# RealTek RTL8150 USB Ethernet
+# USB Wireless
+device		rum		# Ralink Technology RT2501USB wireless NICs
+device		ural		# Ralink Technology RT2500USB wireless NICs
 
 # FireWire support
 device		firewire	# FireWire bus code

Modified: stable/7/sys/i386/conf/GENERIC
==============================================================================
--- stable/7/sys/i386/conf/GENERIC	Tue Nov 17 15:56:45 2009	(r199396)
+++ stable/7/sys/i386/conf/GENERIC	Tue Nov 17 15:59:26 2009	(r199397)
@@ -294,8 +294,6 @@ device		ukbd		# Keyboard
 device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
-device		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
 device		uscanner	# Scanners
 # USB Serial devices
@@ -316,6 +314,9 @@ device		cdce		# Generic USB over Etherne
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 device		rue		# RealTek RTL8150 USB Ethernet
+# USB Wireless
+device		rum		# Ralink Technology RT2501USB wireless NICs
+device		ural		# Ralink Technology RT2500USB wireless NICs
 
 # FireWire support
 device		firewire	# FireWire bus code

Modified: stable/7/sys/pc98/conf/GENERIC
==============================================================================
--- stable/7/sys/pc98/conf/GENERIC	Tue Nov 17 15:56:45 2009	(r199396)
+++ stable/7/sys/pc98/conf/GENERIC	Tue Nov 17 15:59:26 2009	(r199397)
@@ -248,7 +248,6 @@ device		bpf		# Berkeley packet filter
 #device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
 #device		ums		# Mouse
-#device		ural		# Ralink Technology RT2500USB wireless NICs
 #device		urio		# Diamond Rio 500 MP3 player
 #device		uscanner	# Scanners
 # USB Serial devices
@@ -269,6 +268,9 @@ device		bpf		# Berkeley packet filter
 #device		cue		# CATC USB Ethernet
 #device		kue		# Kawasaki LSI USB Ethernet
 #device		rue		# RealTek RTL8150 USB Ethernet
+# USB Wireless
+#device		rum		# Ralink Technology RT2501USB wireless NICs
+#device		ural		# Ralink Technology RT2500USB wireless NICs
 
 # FireWire support
 #device		firewire	# FireWire bus code