From 1c740ed2210a0d124674a477ea538468aba47810 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 31 Oct 2008 17:19:31 -0700 Subject: [PATCH] Move all rtl818x files to a common directory. This change improves the maintainability of these drivers. No functionality is changed. Signed-off-by: Larry Finger Signed-off-by: John W. Linville --- drivers/net/wireless/Makefile | 8 ++------ drivers/net/wireless/rtl818x/Makefile | 7 +++++++ drivers/net/wireless/{ => rtl818x}/rtl8180.h | 0 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 drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.c | 0 drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.h | 0 drivers/net/wireless/{ => rtl818x}/rtl8187.h | 0 drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c | 0 drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.c | 0 drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.h | 0 drivers/net/wireless/{ => rtl818x}/rtl818x.h | 0 17 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 drivers/net/wireless/rtl818x/Makefile rename drivers/net/wireless/{ => rtl818x}/rtl8180.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8187.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.c (100%) rename drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.h (100%) rename drivers/net/wireless/{ => rtl818x}/rtl818x.h (100%) diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 78820840fe21..ed0023d0095f 100644 --- a/drivers/net/wireless/Makefile +++ b/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/drivers/net/wireless/rtl818x/Makefile b/drivers/net/wireless/rtl818x/Makefile new file mode 100644 index 000000000000..c113b3e69046 --- /dev/null +++ b/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/drivers/net/wireless/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180.h similarity index 100% rename from drivers/net/wireless/rtl8180.h rename to drivers/net/wireless/rtl818x/rtl8180.h diff --git a/drivers/net/wireless/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c similarity index 100% rename from drivers/net/wireless/rtl8180_dev.c rename to drivers/net/wireless/rtl818x/rtl8180_dev.c diff --git a/drivers/net/wireless/rtl8180_grf5101.c b/drivers/net/wireless/rtl818x/rtl8180_grf5101.c similarity index 100% rename from drivers/net/wireless/rtl8180_grf5101.c rename to drivers/net/wireless/rtl818x/rtl8180_grf5101.c diff --git a/drivers/net/wireless/rtl8180_grf5101.h b/drivers/net/wireless/rtl818x/rtl8180_grf5101.h similarity index 100% rename from drivers/net/wireless/rtl8180_grf5101.h rename to drivers/net/wireless/rtl818x/rtl8180_grf5101.h diff --git a/drivers/net/wireless/rtl8180_max2820.c b/drivers/net/wireless/rtl818x/rtl8180_max2820.c similarity index 100% rename from drivers/net/wireless/rtl8180_max2820.c rename to drivers/net/wireless/rtl818x/rtl8180_max2820.c diff --git a/drivers/net/wireless/rtl8180_max2820.h b/drivers/net/wireless/rtl818x/rtl8180_max2820.h similarity index 100% rename from drivers/net/wireless/rtl8180_max2820.h rename to drivers/net/wireless/rtl818x/rtl8180_max2820.h diff --git a/drivers/net/wireless/rtl8180_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c similarity index 100% rename from drivers/net/wireless/rtl8180_rtl8225.c rename to drivers/net/wireless/rtl818x/rtl8180_rtl8225.c diff --git a/drivers/net/wireless/rtl8180_rtl8225.h b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.h similarity index 100% rename from drivers/net/wireless/rtl8180_rtl8225.h rename to drivers/net/wireless/rtl818x/rtl8180_rtl8225.h diff --git a/drivers/net/wireless/rtl8180_sa2400.c b/drivers/net/wireless/rtl818x/rtl8180_sa2400.c similarity index 100% rename from drivers/net/wireless/rtl8180_sa2400.c rename to drivers/net/wireless/rtl818x/rtl8180_sa2400.c diff --git a/drivers/net/wireless/rtl8180_sa2400.h b/drivers/net/wireless/rtl818x/rtl8180_sa2400.h similarity index 100% rename from drivers/net/wireless/rtl8180_sa2400.h rename to drivers/net/wireless/rtl818x/rtl8180_sa2400.h diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187.h similarity index 100% rename from drivers/net/wireless/rtl8187.h rename to drivers/net/wireless/rtl818x/rtl8187.h diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c similarity index 100% rename from drivers/net/wireless/rtl8187_dev.c rename to drivers/net/wireless/rtl818x/rtl8187_dev.c diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c similarity index 100% rename from drivers/net/wireless/rtl8187_rtl8225.c rename to drivers/net/wireless/rtl818x/rtl8187_rtl8225.c diff --git a/drivers/net/wireless/rtl8187_rtl8225.h b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.h similarity index 100% rename from drivers/net/wireless/rtl8187_rtl8225.h rename to drivers/net/wireless/rtl818x/rtl8187_rtl8225.h diff --git a/drivers/net/wireless/rtl818x.h b/drivers/net/wireless/rtl818x/rtl818x.h similarity index 100% rename from drivers/net/wireless/rtl818x.h rename to drivers/net/wireless/rtl818x/rtl818x.h -- 2.30.2