diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2014-09-26 16:40:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-30 13:17:14 -0400 |
commit | b1a3bfc97cd95681c511515534b84843998f3ea0 (patch) | |
tree | fbcd369edd72403c7856a4348003e593f43b7f14 /drivers/net/wireless/rtlwifi/Kconfig | |
parent | 7fe3b3abb5da3a105d87640db693c41259138294 (diff) | |
download | talos-op-linux-b1a3bfc97cd95681c511515534b84843998f3ea0.tar.gz talos-op-linux-b1a3bfc97cd95681c511515534b84843998f3ea0.zip |
rtlwifi: rtl8192ee: Move driver from staging to the regular tree
This driver was entered into staging a few cycles ago because there was
not time to integrate the Realtek version into the support routines in
the kernel. Now that there is an effort to converg the code base from Linux
and the Realtek repo, it is time to move this driver. In addition, all the
updates included in the 06/28/2014 version of the Realtek drivers are
included here.
With this change, it will be necessary to delete the staging driver. That
will be handled in a separate patch. As it impacts the staging tree, such a
patch is sent to a different destination.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/Kconfig')
-rw-r--r-- | drivers/net/wireless/rtlwifi/Kconfig | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig index e88bc7348a33..08fde95912ba 100644 --- a/drivers/net/wireless/rtlwifi/Kconfig +++ b/drivers/net/wireless/rtlwifi/Kconfig @@ -5,7 +5,8 @@ menuconfig RTL_CARDS ---help--- This option will enable support for the Realtek mac80211-based wireless drivers. Drivers rtl8192ce, rtl8192cu, rtl8192se, rtl8192de, - rtl8723ae, rtl8723be, rtl8188ee, and rtl8821ae share some common code. + rtl8723ae, rtl8723be, rtl8188ee, rtl8192ee, and rtl8821ae share + some common code. if RTL_CARDS @@ -80,6 +81,17 @@ config RTL8188EE If you choose to build it as a module, it will be called rtl8188ee +config RTL8192EE + tristate "Realtek RTL8192EE Wireless Network Adapter" + depends on PCI + select RTLWIFI + select RTLWIFI_PCI + ---help--- + This is the driver for Realtek RTL8192EE 802.11n PCIe + wireless network adapters. + + If you choose to build it as a module, it will be called rtl8192ee + config RTL8821AE tristate "Realtek RTL8821AE/RTL8812AE Wireless Network Adapter" depends on PCI |