[kernel/f15] Fixup brcm80211 staging neutering

Josh Boyer jwboyer at fedoraproject.org
Thu Dec 1 16:08:27 UTC 2011


commit e3f3ee30cb75a9a4e08ac6b72533ef92e8da9608
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Dec 1 11:07:19 2011 -0500

    Fixup brcm80211 staging neutering
    
    Need to drop references in drivers/staging/Makefile too, or 'make mrproper'
    fails.  Doh.

 brcm80211.patch |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/brcm80211.patch b/brcm80211.patch
index 00bd05f..7c6d42e 100644
--- a/brcm80211.patch
+++ b/brcm80211.patch
@@ -97223,4 +97223,16 @@ index 6403423..0000000
 -obj-$(CONFIG_BRCMUTIL)	+= $(MODULEPFX).o
 -$(MODULEPFX)-objs	= $(BRCMUTIL_OFILES)
 -- 
-1.7.7.3
+diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
+index f3c5e33..f2c2209 100644
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -14,8 +14,6 @@ obj-$(CONFIG_USBIP_CORE)	+= usbip/
+ obj-$(CONFIG_W35UND)		+= winbond/
+ obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
+ obj-$(CONFIG_ECHO)		+= echo/
+-obj-$(CONFIG_BRCMSMAC)		+= brcm80211/
+-obj-$(CONFIG_BRCMFMAC)		+= brcm80211/
+ obj-$(CONFIG_COMEDI)		+= comedi/
+ obj-$(CONFIG_FB_OLPC_DCON)	+= olpc_dcon/
+ obj-$(CONFIG_ASUS_OLED)		+= asus_oled/


More information about the scm-commits mailing list