From 21e4b0726dc671c423e2dc9a85364716219c4502 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 22 Sep 2014 09:39:26 -0500 Subject: rtlwifi: rtl8821ae: Move driver from staging to 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 Signed-off-by: John W. Linville --- drivers/net/wireless/rtlwifi/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/net/wireless/rtlwifi/Makefile') diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile index bba36a06abc..9bfa9d53b82 100644 --- a/drivers/net/wireless/rtlwifi/Makefile +++ b/drivers/net/wireless/rtlwifi/Makefile @@ -28,5 +28,6 @@ obj-$(CONFIG_RTL8723BE) += rtl8723be/ obj-$(CONFIG_RTL8188EE) += rtl8188ee/ obj-$(CONFIG_RTLBTCOEXIST) += btcoexist/ obj-$(CONFIG_RTL8723_COMMON) += rtl8723com/ +obj-$(CONFIG_RTL8821AE) += rtl8821ae/ ccflags-y += -D__CHECK_ENDIAN__ -- cgit v1.2.3-70-g09d2