X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/10f16bb24e2e3fb1e8053653558a18c58c24d0aa..371ae7af3a1d213eaf3b1f3bd0ceb98f5b1ae075:/package/mac80211/patches/005-disable_ssb_build.patch diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch index fc253bd38..401b20f0d 100644 --- a/package/mac80211/patches/005-disable_ssb_build.patch +++ b/package/mac80211/patches/005-disable_ssb_build.patch @@ -1,12 +1,61 @@ --- a/Makefile +++ b/Makefile -@@ -20,8 +20,7 @@ NOSTDINC_FLAGS := -I$(M)/include/ -inclu - obj-y := net/wireless/ net/mac80211/ - ifeq ($(ONLY_CORE),) - obj-$(CONFIG_B44) += drivers/net/b44.o --obj-y += drivers/ssb/ \ -- drivers/misc/eeprom/ \ -+obj-y += drivers/misc/eeprom/ \ - drivers/net/usb/ \ - drivers/net/wireless/ +@@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += + 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/ + + ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),) + obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/ +--- 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 +@@ -298,19 +297,18 @@ CONFIG_IPW2200_QOS=y + # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface + endif #CONFIG_WIRELESS_EXT + +-ifdef CONFIG_SSB +-# Sonics Silicon Backplane +-CONFIG_SSB_SPROM=y +- +-CONFIG_SSB_BLOCKIO=y +-CONFIG_SSB_PCIHOST=y +-CONFIG_SSB_B43_PCI_BRIDGE=y +-ifdef CONFIG_PCMCIA +-CONFIG_SSB_PCMCIAHOST=y +-endif #CONFIG_PCMCIA +-# CONFIG_SSB_DEBUG=y +-CONFIG_SSB_DRIVER_PCICORE=y +-endif #CONFIG_SSB ++# ifdef CONFIG_SSB ++# # Sonics Silicon Backplane ++# CONFIG_SSB_SPROM=y ++# CONFIG_SSB_BLOCKIO=y ++# CONFIG_SSB_PCIHOST=y ++# CONFIG_SSB_B43_PCI_BRIDGE=y ++# ifdef CONFIG_PCMCIA ++# CONFIG_SSB_PCMCIAHOST=y ++# endif #CONFIG_PCMCIA ++# # CONFIG_SSB_DEBUG=y ++# CONFIG_SSB_DRIVER_PCICORE=y ++# endif #CONFIG_SSB + + CONFIG_P54_PCI=m + +@@ -507,7 +505,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv + + ifdef CONFIG_MMC + +-CONFIG_SSB_SDIOHOST=y + CONFIG_B43_SDIO=y + + ifdef CONFIG_CRC7