| 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 | endif |
| 10 | |
| 11 | obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ |
| 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 | @@ -251,21 +250,6 @@ CONFIG_IPW2200_QOS=y |
| 23 | # |
| 24 | # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface |
| 25 | |
| 26 | -ifneq ($(CONFIG_SSB),) |
| 27 | -# Sonics Silicon Backplane |
| 28 | -CONFIG_SSB_SPROM=y |
| 29 | -# CONFIG_SSB_DEBUG=y |
| 30 | - |
| 31 | -CONFIG_SSB_BLOCKIO=y |
| 32 | -CONFIG_SSB_PCIHOST=y |
| 33 | -CONFIG_SSB_B43_PCI_BRIDGE=y |
| 34 | -ifneq ($(CONFIG_PCMCIA),) |
| 35 | -CONFIG_SSB_PCMCIAHOST=y |
| 36 | -endif |
| 37 | -# CONFIG_SSB_DEBUG=y |
| 38 | -CONFIG_SSB_DRIVER_PCICORE=y |
| 39 | -endif |
| 40 | - |
| 41 | CONFIG_P54_PCI=m |
| 42 | |
| 43 | # CONFIG_B44=m |
| 44 | @@ -429,7 +413,6 @@ endif # end of SPI driver list |
| 45 | |
| 46 | ifneq ($(CONFIG_MMC),) |
| 47 | |
| 48 | -CONFIG_SSB_SDIOHOST=y |
| 49 | CONFIG_B43_SDIO=y |
| 50 | CONFIG_WL1251_SDIO=m |
| 51 | |
| 52 | |
