diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 14:45:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 14:45:02 -0800 |
| commit | 6e9c6e87a662c6665053fc3cc7840ed6fa80414e (patch) | |
| tree | 2c573ee6bd9e9d77b35ec956e3dfe8aca0ae6fa6 /drivers/staging/rtl8821ae | |
| parent | e6bed035ca652c43c897731366ea816ea2c4fbf1 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| download | linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.gz linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.bz2 linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.zip | |
Merge 3.14-rc3 into staging-next
We want the fixes in this branch to make testing and future work easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8821ae')
| -rw-r--r-- | drivers/staging/rtl8821ae/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8821ae/Kconfig b/drivers/staging/rtl8821ae/Kconfig index 2aa5dac2f1df..abccc9dabd65 100644 --- a/drivers/staging/rtl8821ae/Kconfig +++ b/drivers/staging/rtl8821ae/Kconfig @@ -1,6 +1,6 @@ config R8821AE tristate "RealTek RTL8821AE Wireless LAN NIC driver" - depends on PCI && WLAN + depends on PCI && WLAN && MAC80211 depends on m select WIRELESS_EXT select WEXT_PRIV |