Update for new drivers and deletion of unused config options
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
diff --git a/Makefile b/Makefile
index d247818..e1cd54e 100644
--- a/Makefile
+++ b/Makefile
@@ -92,8 +92,9 @@
@$(MODPROBE) -l b43
@$(MODPROBE) -l b43legacy
@$(MODPROBE) -l ssb
+ @$(MODPROBE) -l iwlcore
@$(MODPROBE) -l iwl3945
- @$(MODPROBE) -l iwl4965
+ @$(MODPROBE) -l iwlagn
@$(MODPROBE) -l ipw2100
@$(MODPROBE) -l ipw2200
@$(MODPROBE) -l ieee80211
@@ -154,8 +155,9 @@
@$(MODPROBE) -l b43legacy
@$(MODPROBE) -l ssb
@$(MODPROBE) -l rc80211_simple
+ @$(MODPROBE) -l iwlcore
@$(MODPROBE) -l iwl3945
- @$(MODPROBE) -l iwl4965
+ @$(MODPROBE) -l iwlagn
@$(MODPROBE) -l ipw2100
@$(MODPROBE) -l ipw2200
@$(MODPROBE) -l ieee80211
diff --git a/README b/README
index e1c0af2..b6ef1e5 100644
--- a/README
+++ b/README
@@ -85,10 +85,12 @@
Driver
adm8211
ath5k
+ath9k
b43
b43legacy
iwl3945
iwl4965
+iwl5000
ipw2100
ipw2200
libertas_cs (Libertas)
diff --git a/config.mk b/config.mk
index 6185836..8f317b4 100644
--- a/config.mk
+++ b/config.mk
@@ -86,37 +86,48 @@
endif
# Required for older kernels which still use this flag.
-CONFIG_IWLWIFI=m
-CONFIG_IWLCORE=m
CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWL4965_HT=y
+CONFIG_IWL3945_DEBUG=n
+CONFIG_IWL3945_LEDS=y
+# CONFIG_IWL3945_RFKILL=y
+CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWLAGN=m
+CONFIG_IWLAGN_LEDS=y
+CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y
+CONFIG_IWLCORE=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=n
+CONFIG_IWLWIFI_LEDS=y
+# CONFIG_IWLWIFI_RFKILL=y
+
CONFIG_B43=m
# B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
# Example, bcm4318:
# http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module
+ifneq ($(CONFIG_PCMCIA),)
CONFIG_B43_PCMCIA=y
-CONFIG_B43_DMA=y
+endif
CONFIG_B43_PIO=y
# B43_PIO selects SSB_BLOCKIO
CONFIG_SSB_BLOCKIO=y
-CONFIG_B43_DMA_AND_PIO_MODE=y
CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-#CONFIG_B43_RFKILL=n
+# CONFIG_B43_RFKILL=y
CONFIG_B43_LEDS=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_NPHY=y
+CONFIG_B43_DEBUG=n
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
# The Intel ipws
CONFIG_IPW2100=m
+CONFIG_IPW2100_DEBUG=n
CONFIG_IPW2100_MONITOR=y
CONFIG_IPW2200=m
CONFIG_IPW2200_MONITOR=y
@@ -140,9 +151,7 @@
CONFIG_P54_PCI=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_B44=m
