aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-12-22 17:39:05 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-12-22 17:39:05 +0000
commit54ffa895f2b992255fde1b4317e65d6675fd3c52 (patch)
tree1cb8107cb970756d569b27694e5b65ad21826379
parent22d8dcbf447f54b1a4ff0365c8a5f53736984cf0 (diff)
downloadupstream-54ffa895f2b992255fde1b4317e65d6675fd3c52.tar.gz
upstream-54ffa895f2b992255fde1b4317e65d6675fd3c52.tar.bz2
upstream-54ffa895f2b992255fde1b4317e65d6675fd3c52.zip
mac80211: add CONFIG_ATH5K_PCI only when not on aterhos target
SVN-Revision: 24801
-rw-r--r--package/mac80211/Makefile1
-rw-r--r--package/mac80211/patches/019-remove_ath5k_pci_option.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 56c8336cc0..69fe1c16e0 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -881,6 +881,7 @@ BUILDFLAGS:= \
$(if $(CONFIG_PACKAGE_kmod-rt2x00-pci),-DCONFIG_RT2X00_LIB_PCI) \
$(if $(CONFIG_PACKAGE_kmod-rt2x00-usb),-DCONFIG_RT2X00_LIB_USB) \
$(if $(CONFIG_PACKAGE_kmod-rt2x00-soc),-DCONFIG_RT2X00_LIB_SOC) \
+ $(if $(CONFIG_TARGET_atheros),-DCONFIG_ATH5K_AHB,-DCONFIG_ATH5K_PCI) \
-DCONFIG_P54_SPI_DEFAULT_EEPROM
MAKE_OPTS:= \
diff --git a/package/mac80211/patches/019-remove_ath5k_pci_option.patch b/package/mac80211/patches/019-remove_ath5k_pci_option.patch
new file mode 100644
index 0000000000..792ecb563c
--- /dev/null
+++ b/package/mac80211/patches/019-remove_ath5k_pci_option.patch
@@ -0,0 +1,11 @@
+--- 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