mac80211: merge changes from trunk and add back the !LINUX_2_4 dependency

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 019-remove_ath5k_pci_option.patch

--- a/config.mk
+++ b/config.mk
@@ -189,7 +189,7 @@ CONFIG_MAC80211_HWSIM=m
 ifdef CONFIG_PCI
 
 CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
+# CONFIG_ATH5K_PCI=y
 # CONFIG_ATH5K_DEBUG=y
 # CONFIG_ATH5K_AHB=y
 CONFIG_ATH9K_HW=m