From d01946d3aa1a3cb48d1be5676bc2a1bbf8a450cf Mon Sep 17 00:00:00 2001 From: Gertjan van Wingerde Date: Wed, 23 Dec 2009 00:03:24 +0100 Subject: [PATCH] --- yaml --- r: 183391 b: refs/heads/master c: 73a2f1259ebb49f9768aa12eee2a1071345eb7f2 h: refs/heads/master i: 183389: ee0442be6986829c1404f4ca4048612f16a1c2e5 183387: dec96df19ae7418617568e56ad15d527c2f77e39 183383: c2180a69f1d2cbe9057bcd9fb0703318346d23eb 183375: e10c6913f3e6a64229532bb98bd349cfabada838 183359: 8de67135557efdc0e6dee7477e4f31e68a3bed13 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/Kconfig | 4 ++-- trunk/drivers/net/wireless/rt2x00/rt2800pci.c | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e81aa39c0cc5..795009f5a4bd 100644 --- 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 index bf60689aaabb..3ca824a91ad9 100644 --- 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 index 96e024477b2f..2f9deddaf75b 100644 --- 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. */