From fd897a6e1867246e5d0d86970850d987dda490af Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 31 Oct 2008 17:19:31 -0700 Subject: [PATCH] --- yaml --- r: 121994 b: refs/heads/master c: 1c740ed2210a0d124674a477ea538468aba47810 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/Makefile | 8 ++------ trunk/drivers/net/wireless/rtl818x/Makefile | 7 +++++++ trunk/drivers/net/wireless/{ => rtl818x}/rtl8180.h | 0 trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.c | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.h | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.c | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.h | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.c | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.h | 0 trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.c | 0 trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.h | 0 trunk/drivers/net/wireless/{ => rtl818x}/rtl8187.h | 0 trunk/drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.c | 0 .../drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.h | 0 trunk/drivers/net/wireless/{ => rtl818x}/rtl818x.h | 0 18 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 trunk/drivers/net/wireless/rtl818x/Makefile rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8187.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.c (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.h (100%) rename trunk/drivers/net/wireless/{ => rtl818x}/rtl818x.h (100%) diff --git a/[refs] b/[refs] index dd2f62f2a1b7..a87be4db8fb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55b3961953494c340b3625486f484af8ded31dd7 +refs/heads/master: 1c740ed2210a0d124674a477ea538468aba47810 diff --git a/trunk/drivers/net/wireless/Makefile b/trunk/drivers/net/wireless/Makefile index 78820840fe21..ed0023d0095f 100644 --- a/trunk/drivers/net/wireless/Makefile +++ b/trunk/drivers/net/wireless/Makefile @@ -31,6 +31,8 @@ obj-$(CONFIG_HOSTAP) += hostap/ obj-$(CONFIG_B43) += b43/ obj-$(CONFIG_B43LEGACY) += b43legacy/ obj-$(CONFIG_ZD1211RW) += zd1211rw/ +obj-$(CONFIG_RTL8180) += rtl818x/ +obj-$(CONFIG_RTL8187) += rtl818x/ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o @@ -43,12 +45,6 @@ obj-$(CONFIG_LIBERTAS) += libertas/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ -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 - -obj-$(CONFIG_RTL8180) += rtl8180.o -obj-$(CONFIG_RTL8187) += rtl8187.o - obj-$(CONFIG_ADM8211) += adm8211.o obj-$(CONFIG_IWLWIFI) += iwlwifi/ diff --git a/trunk/drivers/net/wireless/rtl818x/Makefile b/trunk/drivers/net/wireless/rtl818x/Makefile new file mode 100644 index 000000000000..c113b3e69046 --- /dev/null +++ b/trunk/drivers/net/wireless/rtl818x/Makefile @@ -0,0 +1,7 @@ +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 + +obj-$(CONFIG_RTL8180) += rtl8180.o +obj-$(CONFIG_RTL8187) += rtl8187.o + + diff --git a/trunk/drivers/net/wireless/rtl8180.h b/trunk/drivers/net/wireless/rtl818x/rtl8180.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8180.h rename to trunk/drivers/net/wireless/rtl818x/rtl8180.h diff --git a/trunk/drivers/net/wireless/rtl8180_dev.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_dev.c rename to trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c diff --git a/trunk/drivers/net/wireless/rtl8180_grf5101.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_grf5101.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_grf5101.c rename to trunk/drivers/net/wireless/rtl818x/rtl8180_grf5101.c diff --git a/trunk/drivers/net/wireless/rtl8180_grf5101.h b/trunk/drivers/net/wireless/rtl818x/rtl8180_grf5101.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_grf5101.h rename to trunk/drivers/net/wireless/rtl818x/rtl8180_grf5101.h diff --git a/trunk/drivers/net/wireless/rtl8180_max2820.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_max2820.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_max2820.c rename to trunk/drivers/net/wireless/rtl818x/rtl8180_max2820.c diff --git a/trunk/drivers/net/wireless/rtl8180_max2820.h b/trunk/drivers/net/wireless/rtl818x/rtl8180_max2820.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_max2820.h rename to trunk/drivers/net/wireless/rtl818x/rtl8180_max2820.h diff --git a/trunk/drivers/net/wireless/rtl8180_rtl8225.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_rtl8225.c rename to trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c diff --git a/trunk/drivers/net/wireless/rtl8180_rtl8225.h b/trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_rtl8225.h rename to trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.h diff --git a/trunk/drivers/net/wireless/rtl8180_sa2400.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_sa2400.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_sa2400.c rename to trunk/drivers/net/wireless/rtl818x/rtl8180_sa2400.c diff --git a/trunk/drivers/net/wireless/rtl8180_sa2400.h b/trunk/drivers/net/wireless/rtl818x/rtl8180_sa2400.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8180_sa2400.h rename to trunk/drivers/net/wireless/rtl818x/rtl8180_sa2400.h diff --git a/trunk/drivers/net/wireless/rtl8187.h b/trunk/drivers/net/wireless/rtl818x/rtl8187.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8187.h rename to trunk/drivers/net/wireless/rtl818x/rtl8187.h diff --git a/trunk/drivers/net/wireless/rtl8187_dev.c b/trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8187_dev.c rename to trunk/drivers/net/wireless/rtl818x/rtl8187_dev.c diff --git a/trunk/drivers/net/wireless/rtl8187_rtl8225.c b/trunk/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c similarity index 100% rename from trunk/drivers/net/wireless/rtl8187_rtl8225.c rename to trunk/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c diff --git a/trunk/drivers/net/wireless/rtl8187_rtl8225.h b/trunk/drivers/net/wireless/rtl818x/rtl8187_rtl8225.h similarity index 100% rename from trunk/drivers/net/wireless/rtl8187_rtl8225.h rename to trunk/drivers/net/wireless/rtl818x/rtl8187_rtl8225.h diff --git a/trunk/drivers/net/wireless/rtl818x.h b/trunk/drivers/net/wireless/rtl818x/rtl818x.h similarity index 100% rename from trunk/drivers/net/wireless/rtl818x.h rename to trunk/drivers/net/wireless/rtl818x/rtl818x.h