ar71xx: merge 3.2 fixes

[openwrt.git] / package / mac80211 / patches / 013-disable_b43_nphy.patch

diff --git a/package/mac80211/patches/013-disable_b43_nphy.patch b/package/mac80211/patches/013-disable_b43_nphy.patch
index f71d3b2..0ff2992 100644 (file)
--- a/package/mac80211/patches/013-disable_b43_nphy.patch
+++ b/package/mac80211/patches/013-disable_b43_nphy.patch
@@ -1,11 +1,13 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -196,7 +196,7 @@ ifneq ($(CONFIG_PCMCIA),)
- endif
+@@ -295,8 +295,8 @@ ifdef CONFIG_MAC80211_LEDS
  CONFIG_B43_LEDS=y
+ endif #CONFIG_MAC80211_LEDS
  CONFIG_B43_PHY_LP=y
--CONFIG_B43_NPHY=y
-+# CONFIG_B43_NPHY is not set
- # CONFIG_B43_FORCE_PIO=y
+-CONFIG_B43_PHY_N=y
+-CONFIG_B43_PHY_HT=y
++# CONFIG_B43_PHY_N=y
++# CONFIG_B43_PHY_HT=y
+ # CONFIG_B43_PHY_LCN=y
  # CONFIG_B43_DEBUG=y