Commit 3cfeb0c3 authored by John W. Linville's avatar John W. Linville
Browse files

rtl818x: move rtl8180 and rtl8187 to separate subdirectories 



These drivers share one header file, but nothing else.  Worse, both
drivers use the rtl8225 part with different register settings.  The
results has been some ugly naming -- let's simplify that.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Acked-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Acked-by: default avatarHerton Ronaldo Krzesinski <herton@mandriva.com.br>
parent 3d986b25

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5032,7 +5032,7 @@ L: linux-wireless@vger.kernel.org 
W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8180*

F:	drivers/net/wireless/rtl818x/rtl8180/



RTL8187 WIRELESS DRIVER

M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -5042,7 +5042,7 @@ L: linux-wireless@vger.kernel.org 
W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8187*

F:	drivers/net/wireless/rtl818x/rtl8187/



RTL8192CE WIRELESS DRIVER

M:	Larry Finger <Larry.Finger@lwfinger.net>

drivers/net/wireless/rtl818x/Makefile

+2 −7
Original line number Diff line number Diff line 
rtl8180-objs		:= rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o

rtl8187-objs		:= rtl8187_dev.o rtl8187_rtl8225.o rtl8187_leds.o rtl8187_rfkill.o



obj-$(CONFIG_RTL8180)	+= rtl8180.o

obj-$(CONFIG_RTL8187)	+= rtl8187.o



obj-$(CONFIG_RTL8180)	+= rtl8180/

obj-$(CONFIG_RTL8187)	+= rtl8187/

drivers/net/wireless/rtl818x/rtl8180/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
rtl8180-objs		:= dev.o rtl8225.o sa2400.o max2820.o grf5101.o



obj-$(CONFIG_RTL8180)	+= rtl8180.o



ccflags-y += -Idrivers/net/wireless/rtl818x

drivers/net/wireless/rtl818x/rtl8180_dev.c→drivers/net/wireless/rtl818x/rtl8180/dev.c

+4 −4
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <net/mac80211.h>



#include "rtl8180.h"

#include "rtl8180_rtl8225.h"

#include "rtl8180_sa2400.h"

#include "rtl8180_max2820.h"

#include "rtl8180_grf5101.h"

#include "rtl8225.h"

#include "sa2400.h"

#include "max2820.h"

#include "grf5101.h"



MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");

MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");

drivers/net/wireless/rtl818x/rtl8180_grf5101.c→drivers/net/wireless/rtl818x/rtl8180/grf5101.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <net/mac80211.h>



#include "rtl8180.h"

#include "rtl8180_grf5101.h"

#include "grf5101.h"



static const int grf5101_encode[] = {

	0x0, 0x8, 0x4, 0xC,

CRA Git | Maintained and supported by SUSTech CRA and CCSE