summaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-20 17:32:52 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-20 17:32:52 +0000
commitf6b146de59bdcb8a3380fef950688eb9b8b41b31 (patch)
tree0288b6471e43dd0cdd42af64214600747d45f804 /package/mac80211
parent1bf4b505626d4cbabd455fe3dd6fbc2ab083104b (diff)
b43: disable pio and pcmcia support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17340 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/Makefile1
-rw-r--r--package/mac80211/patches/010-b43_config.patch29
-rw-r--r--package/mac80211/patches/010-b43_disable_lpphy.patch11
3 files changed, 30 insertions, 11 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 1b283b901..98bb6c23f 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -467,6 +467,7 @@ MAKE_OPTS:= \
CONFIG_RTL8180=$(if $(CONFIG_PACKAGE_kmod-rtl8180),m) \
CONFIG_RTL8187=$(if $(CONFIG_PACKAGE_kmod-rtl8187),m) \
CONFIG_MAC80211_HWSIM=$(if $(CONFIG_PACKAGE_kmod-mac80211-hwsim),m) \
+ CONFIG_PCMCIA= \
CONFIG_LIBIPW= \
CONFIG_LIBERTAS= \
CONFIG_LIBERTAS_CS= \
diff --git a/package/mac80211/patches/010-b43_config.patch b/package/mac80211/patches/010-b43_config.patch
new file mode 100644
index 000000000..fb5c5e20e
--- /dev/null
+++ b/package/mac80211/patches/010-b43_config.patch
@@ -0,0 +1,29 @@
+--- a/config.mk
++++ b/config.mk
+@@ -135,12 +135,12 @@ CONFIG_B43_HWRNG=y
+ CONFIG_B43_PCI_AUTOSELECT=y
+ CONFIG_B43_PCICORE_AUTOSELECT=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_B43_PCMCIA=y
++# CONFIG_B43_PCMCIA=y
+ endif
+-CONFIG_B43_PIO=y
++# CONFIG_B43_PIO=y
+ CONFIG_B43_LEDS=y
+ # CONFIG_B43_RFKILL=y
+-CONFIG_B43_PHY_LP=y
++# CONFIG_B43_PHY_LP=y
+ # CONFIG_B43_DEBUG=y
+ # CONFIG_B43_FORCE_PIO=y
+
+@@ -189,8 +189,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y
+ CONFIG_SSB_PCIHOST=y
+ CONFIG_SSB_B43_PCI_BRIDGE=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+-CONFIG_SSB_PCMCIAHOST=y
++# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
++# CONFIG_SSB_PCMCIAHOST=y
+ endif
+ # CONFIG_SSB_DEBUG=y
+ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
diff --git a/package/mac80211/patches/010-b43_disable_lpphy.patch b/package/mac80211/patches/010-b43_disable_lpphy.patch
deleted file mode 100644
index 7ab591d33..000000000
--- a/package/mac80211/patches/010-b43_disable_lpphy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -140,7 +140,7 @@ endif
- CONFIG_B43_PIO=y
- CONFIG_B43_LEDS=y
- # CONFIG_B43_RFKILL=y
--CONFIG_B43_PHY_LP=y
-+# CONFIG_B43_PHY_LP=y
- # CONFIG_B43_DEBUG=y
- # CONFIG_B43_FORCE_PIO=y
-