diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-27 21:57:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-27 21:57:07 +0000 |
| commit | 46d2b929c768ad4f0817f9132cddb71eaf1f40c4 (patch) | |
| tree | fed67b37873565ef3fbd16fa3083a9138a1bb411 /package/mac80211/patches/006-disable_bcma_build.patch | |
| parent | 0a97fda27ece3b2c2efad038297ae284ff03ff78 (diff) | |
| download | upstream-46d2b929c768ad4f0817f9132cddb71eaf1f40c4.tar.gz upstream-46d2b929c768ad4f0817f9132cddb71eaf1f40c4.tar.bz2 upstream-46d2b929c768ad4f0817f9132cddb71eaf1f40c4.zip | |
mac80211: update to wireless-testing 2011-08-26
SVN-Revision: 28093
Diffstat (limited to 'package/mac80211/patches/006-disable_bcma_build.patch')
| -rw-r--r-- | package/mac80211/patches/006-disable_bcma_build.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/package/mac80211/patches/006-disable_bcma_build.patch b/package/mac80211/patches/006-disable_bcma_build.patch index 93d00cd259..17eff65383 100644 --- a/package/mac80211/patches/006-disable_bcma_build.patch +++ b/package/mac80211/patches/006-disable_bcma_build.patch @@ -1,17 +1,16 @@ --- a/Makefile +++ b/Makefile -@@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += +@@ -29,7 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += + obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/ - obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ --obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/ drivers/misc/eeprom/ -+obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/ +-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/ + obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/ ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),) - obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/ --- a/config.mk +++ b/config.mk -@@ -330,9 +330,9 @@ CONFIG_SSB_DRIVER_PCICORE=y +@@ -331,12 +331,12 @@ CONFIG_SSB_DRIVER_PCICORE=y CONFIG_B43_SSB=y endif #__CONFIG_SSB @@ -22,5 +21,10 @@ +# CONFIG_BCMA_BLOCKIO=y +# CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_DEBUG=y - CONFIG_B43_BCMA=y - CONFIG_B43_BCMA_PIO=y +-CONFIG_B43_BCMA=y +-CONFIG_B43_BCMA_PIO=y ++# CONFIG_B43_BCMA=y ++# CONFIG_B43_BCMA_PIO=y + + CONFIG_P54_PCI=m + |