2008-11-29 17:48:42 +02:00
|
|
|
--- a/Makefile
|
|
|
|
+++ b/Makefile
|
2010-05-25 20:29:50 +03:00
|
|
|
@@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
|
2010-01-07 21:15:05 +02:00
|
|
|
obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
|
|
|
|
|
|
|
|
obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/
|
|
|
|
-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/ drivers/misc/eeprom/
|
|
|
|
+obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/
|
|
|
|
endif
|
|
|
|
|
|
|
|
obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
|
2010-05-15 14:04:53 +03:00
|
|
|
--- a/config.mk
|
|
|
|
+++ b/config.mk
|
|
|
|
@@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
|
|
|
|
CONFIG_PCI=y
|
|
|
|
CONFIG_USB=y
|
|
|
|
CONFIG_PCMCIA=y
|
|
|
|
- CONFIG_SSB=m
|
|
|
|
else
|
|
|
|
include $(KLIB_BUILD)/.config
|
|
|
|
endif
|
2010-09-15 01:53:54 +03:00
|
|
|
@@ -280,21 +279,6 @@ endif #CONFIG_WEXT_PRIV
|
|
|
|
endif #CONFIG_WEXT_SPY
|
|
|
|
endif #CONFIG_WIRELESS_EXT
|
2010-05-15 14:04:53 +03:00
|
|
|
|
2010-09-15 01:53:54 +03:00
|
|
|
-ifdef CONFIG_SSB
|
2010-05-15 14:04:53 +03:00
|
|
|
-# Sonics Silicon Backplane
|
|
|
|
-CONFIG_SSB_SPROM=y
|
|
|
|
-# CONFIG_SSB_DEBUG=y
|
|
|
|
-
|
|
|
|
-CONFIG_SSB_BLOCKIO=y
|
|
|
|
-CONFIG_SSB_PCIHOST=y
|
|
|
|
-CONFIG_SSB_B43_PCI_BRIDGE=y
|
2010-09-15 01:53:54 +03:00
|
|
|
-ifdef CONFIG_PCMCIA
|
2010-05-15 14:04:53 +03:00
|
|
|
-CONFIG_SSB_PCMCIAHOST=y
|
2010-09-15 01:53:54 +03:00
|
|
|
-endif #CONFIG_PCMCIA
|
2010-05-15 14:04:53 +03:00
|
|
|
-# CONFIG_SSB_DEBUG=y
|
|
|
|
-CONFIG_SSB_DRIVER_PCICORE=y
|
2010-09-15 01:53:54 +03:00
|
|
|
-endif #CONFIG_SSB
|
2010-05-15 14:04:53 +03:00
|
|
|
-
|
|
|
|
CONFIG_P54_PCI=m
|
|
|
|
|
|
|
|
# CONFIG_B44=m
|
2010-09-15 01:53:54 +03:00
|
|
|
@@ -474,7 +458,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
|
2010-05-15 14:04:53 +03:00
|
|
|
|
2010-09-15 01:53:54 +03:00
|
|
|
ifdef CONFIG_MMC
|
2010-05-15 14:04:53 +03:00
|
|
|
|
|
|
|
-CONFIG_SSB_SDIOHOST=y
|
|
|
|
CONFIG_B43_SDIO=y
|
|
|
|
|
2010-09-15 01:53:54 +03:00
|
|
|
ifdef CONFIG_CRC7
|