Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d461c91 authored by Sean MacLennan's avatar Sean MacLennan Committed by Greg Kroah-Hartman
Browse files

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: default avatarSean MacLennan <seanm@seanm.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d37e0208

drivers/staging/rtl8192e/Kconfig

+5 −9
Original line number Diff line number Diff line
@@ -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

drivers/staging/rtl8192e/Makefile

+1 −19
Original line number Diff line number Diff line
@@ -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__

drivers/staging/rtl8192e/rtl8192e/Kconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
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---

drivers/staging/rtl8192e/rtl8192e/Makefile

0 → 100644
+21 −0
Original line number Diff line number Diff line 
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__