---

yaml
---
r: 89929
b: refs/heads/master
c: 0d84d78
h: refs/heads/master
i:
  89927: 2771258
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f948db5de53ec49ede377df30eed0642cc213055
+refs/heads/master: 0d84d78db5bad848e385cbb1e4ae2ea1f5f27641

trunk/drivers/net/wireless/rt2x00/Kconfig

@@ -11,18 +11,17 @@ config RT2X00
 	  will also be created. That library (when the driver is built as
 	  a module) will be called "rt2x00lib.ko".
 
+if RT2X00
+
 config RT2X00_LIB
 	tristate
-	depends on RT2X00
 
 config RT2X00_LIB_PCI
 	tristate
-	depends on RT2X00
 	select RT2X00_LIB
 
 config RT2X00_LIB_USB
 	tristate
-	depends on RT2X00
 	select RT2X00_LIB
 
 config RT2X00_LIB_FIRMWARE
@@ -47,7 +46,7 @@ config RT2X00_LIB_LEDS
 
 config RT2400PCI
 	tristate "Ralink rt2400 pci/pcmcia support"
-	depends on RT2X00 && PCI
+	depends on PCI
 	select RT2X00_LIB_PCI
 	select EEPROM_93CX6
 	---help---
@@ -73,7 +72,7 @@ config RT2400PCI_LEDS
 
 config RT2500PCI
 	tristate "Ralink rt2500 pci/pcmcia support"
-	depends on RT2X00 && PCI
+	depends on PCI
 	select RT2X00_LIB_PCI
 	select EEPROM_93CX6
 	---help---
@@ -99,7 +98,7 @@ config RT2500PCI_LEDS
 
 config RT61PCI
 	tristate "Ralink rt61 pci/pcmcia support"
-	depends on RT2X00 && PCI
+	depends on PCI
 	select RT2X00_LIB_PCI
 	select RT2X00_LIB_FIRMWARE
 	select EEPROM_93CX6
@@ -126,7 +125,7 @@ config RT61PCI_LEDS
 
 config RT2500USB
 	tristate "Ralink rt2500 usb support"
-	depends on RT2X00 && USB
+	depends on USB
 	select RT2X00_LIB_USB
 	---help---
 	  This is an experimental driver for the Ralink rt2500 wireless chip.
@@ -142,7 +141,7 @@ config RT2500USB_LEDS
 
 config RT73USB
 	tristate "Ralink rt73 usb support"
-	depends on RT2X00 && USB
+	depends on USB
 	select RT2X00_LIB_USB
 	select RT2X00_LIB_FIRMWARE
 	---help---
@@ -171,3 +170,4 @@ config RT2X00_DEBUG
 	---help---
 	  Enable debugging output for all rt2x00 modules
 
+endif