From cb3de8cb2930872cd4b069fe43933968967abc93 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 25 Nov 2010 15:48:34 +0100 Subject: [PATCH] compat-wireless: correct rt2x00 config options * Do not add PCI IDs for not jet supported devices. * remove some not included config options and add some newly introduced options Signed-off-by: Hauke Mehrtens --- config.mk | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/config.mk b/config.mk index ee20543ae650..0f583208795a 100644 --- a/config.mk +++ b/config.mk @@ -312,10 +312,8 @@ CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m ifdef CONFIG_CRC_CCITT CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_PCI=y -# CONFIG_RT2800PCI_RT30XX=y +# CONFIG_RT2800PCI_RT33XX=y # CONFIG_RT2800PCI_RT35XX=y -# CONFIG_RT2800PCI_SOC=y endif #CONFIG_CRC_CCITT NEED_RT2X00=y @@ -324,7 +322,6 @@ NEED_RT2X00=y # driver as we're in the PCI section. ifdef CONFIG_CRC_ITU_T CONFIG_RT61PCI=m -NEED_RT2X00_FIRMWARE=y endif #CONFIG_CRC_ITU_T CONFIG_MWL8K=m @@ -435,8 +432,8 @@ CONFIG_ATH9K_HTC=m CONFIG_RT2500USB=m ifdef CONFIG_CRC_CCITT CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT30XX=y -CONFIG_RT2800USB_RT35XX=y +# CONFIG_RT2800USB_RT33XX=y +# CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_UNKNOWN=y endif #CONFIG_CRC_CCITT CONFIG_RT2X00_LIB_USB=m @@ -444,7 +441,6 @@ NEED_RT2X00=y # RT73USB requires firmware ifdef CONFIG_CRC_ITU_T CONFIG_RT73USB=m -NEED_RT2X00_FIRMWARE=y endif #CONFIG_CRC_ITU_T ifdef CONFIG_COMPAT_KERNEL_27 @@ -550,6 +546,7 @@ CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_HT=y CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y +# CONFIG_RT2X00_LIB_SOC=y ifdef CONFIG_COMPAT_KERNEL_25 CONFIG_RT2X00_LIB_LEDS=n else #CONFIG_COMPAT_KERNEL_25 @@ -559,10 +556,6 @@ endif #CONFIG_COMPAT_KERNEL_25 # CONFIG_RT2X00_LIB_DEBUGFS endif -ifeq ($(NEED_RT2X00_FIRMWARE),y) -CONFIG_RT2X00_LIB_FIRMWARE=y -endif - # p54 CONFIG_P54_COMMON=m CONFIG_P54_LEDS=y -- 2.30.2