提交 3d461c91 编写于 作者: S Sean MacLennan 提交者: Greg Kroah-Hartman

rtl8192e: Split into two directories

Now that the rtl8192e driver is split up, it makes sense to keep the
rtllib code in one directory and the rtl8192e specific code in
another. This patch contains the split and the fixup of includes.

Since rtl_core.h already included rtllib.h and dot11d.h, rtl_core.h
was updated to point to the parent directory. All other references to
rtllib.h and dot11d.h in the rtl8192e specific code where deleted
rather than fixed. This leaves just one file that needs to know the
real location of the rtllib includes.
Signed-off-by: NSean MacLennan <seanm@seanm.ca>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 d37e0208
......@@ -8,6 +8,8 @@ config RTLLIB
If unsure, say N.
if RTLLIB
config RTLLIB_CRYPTO
tristate "Support for rtllib crypto support"
depends on RTLLIB
......@@ -44,12 +46,6 @@ config RTLLIB_CRYPTO_WEP
If you enabled RTLLIB, you want this.
config RTL8192E
tristate "RealTek RTL8192E Wireless LAN NIC driver"
depends on PCI && WLAN && RTLLIB
depends on m
select WIRELESS_EXT
select WEXT_PRIV
select CRYPTO
default N
---help---
source "drivers/staging/rtl8192e/rtl8192e/Kconfig"
endif
......@@ -17,24 +17,6 @@ obj-$(CONFIG_RTLLIB_CRYPTO_CCMP) += rtllib_crypt_ccmp.o
obj-$(CONFIG_RTLLIB_CRYPTO_TKIP) += rtllib_crypt_tkip.o
obj-$(CONFIG_RTLLIB_CRYPTO_WEP) += rtllib_crypt_wep.o
r8192e_pci-objs := \
r8192E_dev.o \
r8192E_phy.o \
r8192E_firmware.o \
r8192E_cmdpkt.o \
r8192E_hwimg.o \
r8190P_rtl8256.o \
rtl_cam.o \
rtl_core.o \
rtl_debug.o \
rtl_dm.o \
rtl_eeprom.o \
rtl_ethtool.o \
rtl_pci.o \
rtl_pm.o \
rtl_ps.o \
rtl_wx.o \
obj-$(CONFIG_RTL8192E) += r8192e_pci.o
obj-$(CONFIG_RTL8192E) += rtl8192e/
ccflags-y += -D__CHECK_ENDIAN__
config RTL8192E
tristate "RealTek RTL8192E Wireless LAN NIC driver"
depends on PCI && WLAN && RTLLIB
depends on m
select WIRELESS_EXT
select WEXT_PRIV
select CRYPTO
default N
---help---
r8192e_pci-objs := \
r8192E_dev.o \
r8192E_phy.o \
r8192E_firmware.o \
r8192E_cmdpkt.o \
r8192E_hwimg.o \
r8190P_rtl8256.o \
rtl_cam.o \
rtl_core.o \
rtl_debug.o \
rtl_dm.o \
rtl_eeprom.o \
rtl_ethtool.o \
rtl_pci.o \
rtl_pm.o \
rtl_ps.o \
rtl_wx.o \
obj-$(CONFIG_RTL8192E) += r8192e_pci.o
ccflags-y += -D__CHECK_ENDIAN__
......@@ -23,7 +23,6 @@
#include "r8190P_rtl8256.h"
#include "r8192E_phy.h"
#include "rtl_dm.h"
#include "dot11d.h"
#include "r8192E_hwimg.h"
......
......@@ -50,9 +50,9 @@
/* Need this defined before including local include files */
#define DRV_NAME "rtl819xE"
#include "rtllib.h"
#include "../rtllib.h"
#include "dot11d.h"
#include "../dot11d.h"
#include "r8192E_firmware.h"
#include "r8192E_hw.h"
......
......@@ -19,7 +19,6 @@
#include <linux/string.h>
#include "rtl_core.h"
#include "dot11d.h"
#define RATE_COUNT 12
static u32 rtl8192_rates[] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册