Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-st…

…aging 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>
git-mirror · Apr 25, 2011 · 60b0fa1 · 60b0fa1
2 parents 5d46f32 + 0215c5c
commit 60b0fa1
Show file tree

Hide file tree

Showing 163 changed files with 0 additions and 74,159 deletions.
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -67,10 +67,6 @@ source "drivers/staging/echo/Kconfig"
 
 source "drivers/staging/brcm80211/Kconfig"
 
-source "drivers/staging/rt2860/Kconfig"
-
-source "drivers/staging/rt2870/Kconfig"
-
 source "drivers/staging/comedi/Kconfig"
 
 source "drivers/staging/olpc_dcon/Kconfig"

diff --git 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/

diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
diff --git a/drivers/staging/rt2860/Makefile b/drivers/staging/rt2860/Makefile
diff --git a/drivers/staging/rt2860/TODO b/drivers/staging/rt2860/TODO
diff --git a/drivers/staging/rt2860/ap.h b/drivers/staging/rt2860/ap.h