| 1 | --- a/Makefile |
| 2 | +++ b/Makefile |
| 3 | @@ -26,7 +26,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += |
| 4 | |
| 5 | obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/ |
| 6 | |
| 7 | -obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/ |
| 8 | obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/ |
| 9 | obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/ |
| 10 | |
| 11 | --- a/config.mk |
| 12 | +++ b/config.mk |
| 13 | @@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config), |
| 14 | CONFIG_PCI=y |
| 15 | CONFIG_USB=y |
| 16 | CONFIG_PCMCIA=y |
| 17 | - CONFIG_SSB=m |
| 18 | else |
| 19 | include $(KLIB_BUILD)/.config |
| 20 | endif |
| 21 | @@ -344,7 +343,8 @@ CONFIG_IPW2200_QOS=y |
| 22 | # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface |
| 23 | endif #CONFIG_WIRELESS_EXT |
| 24 | |
| 25 | -ifdef CONFIG_SSB |
| 26 | +# disabled |
| 27 | +ifdef __CONFIG_SSB |
| 28 | # Sonics Silicon Backplane |
| 29 | CONFIG_SSB_SPROM=y |
| 30 | |
| 31 | @@ -357,7 +357,7 @@ endif #CONFIG_PCMCIA |
| 32 | # CONFIG_SSB_DEBUG=y |
| 33 | CONFIG_SSB_DRIVER_PCICORE=y |
| 34 | CONFIG_B43_SSB=y |
| 35 | -endif #CONFIG_SSB |
| 36 | +endif #__CONFIG_SSB |
| 37 | |
| 38 | CONFIG_BCMA=m |
| 39 | CONFIG_BCMA_BLOCKIO=y |
| 40 | @@ -568,7 +568,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv |
| 41 | |
| 42 | ifdef CONFIG_MMC |
| 43 | |
| 44 | -CONFIG_SSB_SDIOHOST=y |
| 45 | CONFIG_B43_SDIO=y |
| 46 | |
| 47 | ifdef CONFIG_CRC7 |
| 48 | |