Search Linux Wireless

[PATCH 2/5] compat-wireless: correct rt2x00 config options

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* 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 <hauke@xxxxxxxxxx>
---
 config.mk |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/config.mk b/config.mk
index ee20543..0f58320 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
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux