From: Greg Kroah-Hartman Date: Mon, 25 Apr 2011 23:55:53 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi... X-Git-Tag: upstream/snapshot3+hdmi~10345^2~709 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60b0fa1af9b323f096fb5335f33cc5b4a8f0198d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge git://git./linux/kernel/git/lwfinger/linux-staging into staging-next * git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging: staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless Signed-off-by: Greg Kroah-Hartman --- 60b0fa1af9b323f096fb5335f33cc5b4a8f0198d diff --cc drivers/staging/Makefile index 1d11306,dc642ab..7d38925 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@@ -16,10 -16,7 +16,8 @@@ obj-$(CONFIG_USB_IP_COMMON) += usbip obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ -obj-$(CONFIG_BRCM80211) += brcm80211/ +obj-$(CONFIG_BRCMSMAC) += brcm80211/ +obj-$(CONFIG_BRCMFMAC) += brcm80211/ - obj-$(CONFIG_RT2860) += rt2860/ - obj-$(CONFIG_RT2870) += rt2870/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_ASUS_OLED) += asus_oled/