diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 16:55:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 16:55:53 -0700 |
| commit | 60b0fa1af9b323f096fb5335f33cc5b4a8f0198d (patch) | |
| tree | 10a943a73593a1be7be0b0833a1daf7a7bfcd9bf /drivers/staging/Makefile | |
| parent | 5d46f3266728913d05106ee82fb5f043be06eb21 (diff) | |
| parent | 0215c5cfd79e8c2e88c713cc8485d095e810c662 (diff) | |
Merge git://git.kernel.org/pub/scm/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 <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 1d11306eee2..7d38925d585 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -18,8 +18,6 @@ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ 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/ |