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/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index e3786f161bc3..dcd8a7642363 100644 --- 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" |