Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- config.mk | 4 +- patches/35-fix-makefile-includes.patch | 42 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/config.mk b/config.mk index 7a29d46..d8712e8 100644 --- a/config.mk +++ b/config.mk @@ -538,7 +538,7 @@ CONFIG_BT_MRVL_SDIO=m ifneq ($(CONFIG_COMPAT_STAGING),) CONFIG_BRCM80211=m -CONFIG_BRCM80211_PCI=y +CONFIG_BRCMSMAC=y ifdef CONFIG_WIRELESS_EXT CONFIG_ATH6KL_CFG80211=y @@ -553,7 +553,7 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y CONFIG_ATH6K_LEGACY=m -# It is not possible to compile CONFIG_BRCM80211 and CONFIG_BRCMFMAC as +# It is not possible to compile CONFIG_BRCMSMAC and CONFIG_BRCMFMAC as # module at the same time # CONFIG_BRCMFMAC=y diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch index c80e11f..2142da2 100644 --- a/patches/35-fix-makefile-includes.patch +++ b/patches/35-fix-makefile-includes.patch @@ -18,26 +18,9 @@ path the make process will search in the kernel tree for the headers. -ccflags-y += -Idrivers/net/wireless/rtl818x +ccflags-y += -I$(obj)/.. ---- a/drivers/staging/brcm80211/Makefile -+++ b/drivers/staging/brcm80211/Makefile -@@ -24,10 +24,10 @@ ccflags-y := \ - -DDBAND \ - -DBCMDMA32 \ - -DBCMNVRAMR \ -- -Idrivers/staging/brcm80211/sys \ -- -Idrivers/staging/brcm80211/phy \ -- -Idrivers/staging/brcm80211/util \ -- -Idrivers/staging/brcm80211/include -+ -I$(obj)/sys \ -+ -I$(obj)/phy \ -+ -I$(obj)/util \ -+ -I$(obj)/include - - PCI_CFLAGS := -DWLC_LOW - --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile -@@ -33,9 +33,9 @@ ccflags-y := \ +@@ -32,9 +32,9 @@ ccflags-y := \ -DPKT_FILTER_SUPPORT \ -DSHOW_EVENTS \ -DTOE \ @@ -45,8 +28,25 @@ path the make process will search in the kernel tree for the headers. - -Idrivers/staging/brcm80211/include \ - -Idrivers/staging/brcm80211/util + -I$(obj) \ -+ -I$(obj)/../include \ ++ -I$(obj)/../include \ + -I$(obj)/../util - DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o \ - wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o \ + DHDOFILES = \ + wl_cfg80211.o \ +--- a/drivers/staging/brcm80211/brcmsmac/Makefile ++++ b/drivers/staging/brcm80211/brcmsmac/Makefile +@@ -24,10 +24,10 @@ ccflags-y := \ + -DDBAND \ + -DBCMDMA32 \ + -DBCMNVRAMR \ +- -Idrivers/staging/brcm80211/brcmsmac \ +- -Idrivers/staging/brcm80211/brcmsmac/phy \ +- -Idrivers/staging/brcm80211/util \ +- -Idrivers/staging/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/phy \ ++ -I$(obj)/../util \ ++ -I$(obj)/../include + + BRCMSMAC_OFILES := \ + wl_mac80211.o \ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
