c0c371b581
SVN-Revision: 31322
49 lines
1.2 KiB
Diff
49 lines
1.2 KiB
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -29,7 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
|
|
|
|
obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
|
|
|
|
-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/
|
|
obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/
|
|
obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/
|
|
|
|
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -3,7 +3,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
|
|
export CONFIG_PCI=y
|
|
export CONFIG_USB=y
|
|
export CONFIG_PCMCIA=y
|
|
- export CONFIG_SSB=m
|
|
+# export CONFIG_SSB=m
|
|
else
|
|
include $(KLIB_BUILD)/.config
|
|
endif
|
|
@@ -338,7 +338,8 @@ export CONFIG_IPW2200_QOS=y
|
|
# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
|
|
endif #CONFIG_WIRELESS_EXT
|
|
|
|
-ifdef CONFIG_SSB
|
|
+# disabled
|
|
+ifdef __CONFIG_SSB
|
|
# Sonics Silicon Backplane
|
|
export CONFIG_SSB_SPROM=y
|
|
|
|
@@ -351,7 +352,7 @@ endif #CONFIG_PCMCIA
|
|
# CONFIG_SSB_DEBUG=y
|
|
export CONFIG_SSB_DRIVER_PCICORE=y
|
|
export CONFIG_B43_SSB=y
|
|
-endif #CONFIG_SSB
|
|
+endif #__CONFIG_SSB
|
|
|
|
export CONFIG_BCMA=m
|
|
export CONFIG_BCMA_BLOCKIO=y
|
|
@@ -562,7 +563,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
|
|
|
|
ifdef CONFIG_MMC
|
|
|
|
-export CONFIG_SSB_SDIOHOST=y
|
|
+# export CONFIG_SSB_SDIOHOST=y
|
|
export CONFIG_B43_SDIO=y
|
|
|
|
ifdef CONFIG_CRC7
|