mac80211: backport latest version from trunk as of r27395
[openwrt-10.03/.git] / package / mac80211 / patches / 005-disable_ssb_build.patch
1 --- a/Makefile
2 +++ b/Makefile
3 @@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
4  obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
5  
6  obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/
7 -obj-$(CONFIG_COMPAT_VAR_MODULES) +=  drivers/ssb/ drivers/bcma/ drivers/misc/eeprom/
8 +obj-$(CONFIG_COMPAT_VAR_MODULES) +=  drivers/bcma/ drivers/misc/eeprom/
9  
10  ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
11  obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
12 --- a/config.mk
13 +++ b/config.mk
14 @@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
15   CONFIG_PCI=y
16   CONFIG_USB=y
17   CONFIG_PCMCIA=y
18 - CONFIG_SSB=m
19  else
20  include $(KLIB_BUILD)/.config
21  endif
22 @@ -314,7 +313,8 @@ CONFIG_IPW2200_QOS=y
23  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
24  endif #CONFIG_WIRELESS_EXT
25  
26 -ifdef CONFIG_SSB
27 +# disabled
28 +ifdef __CONFIG_SSB
29  # Sonics Silicon Backplane
30  CONFIG_SSB_SPROM=y
31  
32 @@ -327,7 +327,7 @@ endif #CONFIG_PCMCIA
33  # CONFIG_SSB_DEBUG=y
34  CONFIG_SSB_DRIVER_PCICORE=y
35  CONFIG_B43_SSB=y
36 -endif #CONFIG_SSB
37 +endif #__CONFIG_SSB
38  
39  CONFIG_BCMA=m
40  CONFIG_BCMA_BLOCKIO=y
41 @@ -534,7 +534,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
42  
43  ifdef CONFIG_MMC
44  
45 -CONFIG_SSB_SDIOHOST=y
46  CONFIG_B43_SDIO=y
47  
48  ifdef CONFIG_CRC7