mac80211: sync with trunk (as of r25965)
[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/misc/eeprom/
8 +obj-$(CONFIG_COMPAT_VAR_MODULES) +=  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 @@ -300,19 +299,18 @@ 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 -# Sonics Silicon Backplane
28 -CONFIG_SSB_SPROM=y
29 -
30 -CONFIG_SSB_BLOCKIO=y
31 -CONFIG_SSB_PCIHOST=y
32 -CONFIG_SSB_B43_PCI_BRIDGE=y
33 -ifdef CONFIG_PCMCIA
34 -CONFIG_SSB_PCMCIAHOST=y
35 -endif #CONFIG_PCMCIA
36 -# CONFIG_SSB_DEBUG=y
37 -CONFIG_SSB_DRIVER_PCICORE=y
38 -endif #CONFIG_SSB
39 +# ifdef CONFIG_SSB
40 +# # Sonics Silicon Backplane
41 +# CONFIG_SSB_SPROM=y
42 +# CONFIG_SSB_BLOCKIO=y
43 +# CONFIG_SSB_PCIHOST=y
44 +# CONFIG_SSB_B43_PCI_BRIDGE=y
45 +# ifdef CONFIG_PCMCIA
46 +# CONFIG_SSB_PCMCIAHOST=y
47 +# endif #CONFIG_PCMCIA
48 +# # CONFIG_SSB_DEBUG=y
49 +# CONFIG_SSB_DRIVER_PCICORE=y
50 +# endif #CONFIG_SSB
51  
52  CONFIG_P54_PCI=m
53  
54 @@ -514,7 +512,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
55  
56  ifdef CONFIG_MMC
57  
58 -CONFIG_SSB_SDIOHOST=y
59  CONFIG_B43_SDIO=y
60  
61  ifdef CONFIG_CRC7