From: "Luis R. Rodriguez" <[email protected]> These are now upstream thanks to commit 8e8d4ff0 on next-20130415.
commit 8e8d4ff051672d4a2939e7d6925c4acd234b0220 Author: Johannes Berg <[email protected]> Date: Thu Apr 11 16:15:28 2013 +0200 brcm80211: simplify makefiles This came up during my backporting work but it seems perfectly appropriate for the kernel as well. Signed-off-by: Johannes Berg <[email protected]> Acked-by: Arend van Spriel <[email protected]> Signed-off-by: John W. Linville <[email protected]> Signed-off-by: Luis R. Rodriguez <[email protected]> --- .../network/72-brcm80211-makefiles/brcmsmac.patch | 25 -------------------- .../network/72-brcm80211-makefiles/brcmutil.patch | 15 ------------ 2 files changed, 40 deletions(-) delete mode 100644 patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch delete mode 100644 patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch deleted file mode 100644 index 112c769..0000000 --- a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile -+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile -@@ -21,7 +21,7 @@ ccflags-y := \ - -Idrivers/net/wireless/brcm80211/brcmsmac/phy \ - -Idrivers/net/wireless/brcm80211/include - --BRCMSMAC_OFILES := \ -+brcmsmac-y := \ - mac80211_if.o \ - ucode_loader.o \ - ampdu.o \ -@@ -43,11 +43,6 @@ BRCMSMAC_OFILES := \ - brcms_trace_events.o \ - debug.o - --ifdef CONFIG_BCMA_DRIVER_GPIO --BRCMSMAC_OFILES += led.o --endif -+brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o - --MODULEPFX := brcmsmac -- --obj-$(CONFIG_BRCMSMAC) += $(MODULEPFX).o --$(MODULEPFX)-objs = $(BRCMSMAC_OFILES) -+obj-$(CONFIG_BRCMSMAC) += brcmsmac.o diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch deleted file mode 100644 index 3b84733..0000000 --- a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmutil/Makefile -+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile -@@ -19,10 +19,5 @@ ccflags-y := \ - -Idrivers/net/wireless/brcm80211/brcmutil \ - -Idrivers/net/wireless/brcm80211/include - --BRCMUTIL_OFILES := \ -- utils.o -- --MODULEPFX := brcmutil -- --obj-$(CONFIG_BRCMUTIL) += $(MODULEPFX).o --$(MODULEPFX)-objs = $(BRCMUTIL_OFILES) -+obj-$(CONFIG_BRCMUTIL) += brcmutil.o -+brcmutil-objs = utils.o -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
