diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-28 00:49:46 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-28 00:49:46 (GMT) |
commit | 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (patch) | |
tree | 080232e75f0e138b8642af44b18d296011afdebb /drivers/staging/rtl8187se/Kconfig | |
parent | 3c4f1158cd887a1a8c1309fc6d07907160e8e820 (diff) | |
parent | acfa5110b83b171ec509eaf2d1a9e93a5f4709bd (diff) | |
download | linux-fsl-qoriq-778ef1e6cbb049c9bcbf405936ee6f2b6e451892.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: w35und: fix usb_control_msg() error handling in wb35_probe()
Staging: w35und: fix registration with wlan stack
Staging: panel: fix oops on panel_cleanup_module
Staging: rtl8187se: Fix oops and memory poison caused by builtin ieee80211.
Staging: rtl8187se: fix Kconfig dependencies
Diffstat (limited to 'drivers/staging/rtl8187se/Kconfig')
-rw-r--r-- | drivers/staging/rtl8187se/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig index 79c225a..f636296 100644 --- a/drivers/staging/rtl8187se/Kconfig +++ b/drivers/staging/rtl8187se/Kconfig @@ -1,5 +1,6 @@ config RTL8187SE tristate "RealTek RTL8187SE Wireless LAN NIC driver" depends on PCI + depends on WIRELESS_EXT && COMPAT_NET_DEV_OPS default N ---help--- |