---

yaml --- r: 183391 b: refs/heads/master c: 73a2f12 h: refs/heads/master i: 183389: ee0442b 183387: dec96df 183383: c2180a6 183375: e10c691 183359: 8de6713 v: v3
git-mirror · Dec 28, 2009 · d01946d · d01946d
1 parent 0ddfa3a
commit d01946d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac394917f5138f9bb2774718312dec179164f3dc
+refs/heads/master: 73a2f1259ebb49f9768aa12eee2a1071345eb7f2
diff --git a/trunk/drivers/net/wireless/rt2x00/Kconfig b/trunk/drivers/net/wireless/rt2x00/Kconfig
@@ -54,12 +54,12 @@ config RT61PCI
 	  When compiled as a module, this driver will be called rt61pci.
 
 config RT2800PCI_PCI
-	tristate
+	boolean
 	depends on PCI
 	default y
 
 config RT2800PCI_SOC
-	tristate
+	boolean
 	depends on RALINK_RT288X || RALINK_RT305X
 	default y
 

diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800pci.c b/trunk/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -48,14 +48,6 @@
 #include "rt2800.h"
 #include "rt2800pci.h"
 
-#ifdef CONFIG_RT2800PCI_PCI_MODULE
-#define CONFIG_RT2800PCI_PCI
-#endif
-
-#ifdef CONFIG_RT2800PCI_SOC_MODULE
-#define CONFIG_RT2800PCI_SOC
-#endif
-
 /*
  * Allow hardware encryption to be disabled.
  */