diff options
Diffstat (limited to 'drivers/net/wireless/rtl818x')
-rw-r--r-- | drivers/net/wireless/rtl818x/Makefile | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/Makefile | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/dev.c (renamed from drivers/net/wireless/rtl818x/rtl8180_dev.c) | 8 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/grf5101.c (renamed from drivers/net/wireless/rtl818x/rtl8180_grf5101.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/grf5101.h (renamed from drivers/net/wireless/rtl818x/rtl8180_grf5101.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/max2820.c (renamed from drivers/net/wireless/rtl818x/rtl8180_max2820.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/max2820.h (renamed from drivers/net/wireless/rtl818x/rtl8180_max2820.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/rtl8180.h (renamed from drivers/net/wireless/rtl818x/rtl8180.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/rtl8225.c (renamed from drivers/net/wireless/rtl818x/rtl8180_rtl8225.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/rtl8225.h (renamed from drivers/net/wireless/rtl818x/rtl8180_rtl8225.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/sa2400.c (renamed from drivers/net/wireless/rtl818x/rtl8180_sa2400.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/sa2400.h (renamed from drivers/net/wireless/rtl818x/rtl8180_sa2400.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/Makefile | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/dev.c (renamed from drivers/net/wireless/rtl818x/rtl8187_dev.c) | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/leds.c (renamed from drivers/net/wireless/rtl818x/rtl8187_leds.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/leds.h (renamed from drivers/net/wireless/rtl818x/rtl8187_leds.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/rfkill.c (renamed from drivers/net/wireless/rtl818x/rtl8187_rfkill.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/rfkill.h (renamed from drivers/net/wireless/rtl818x/rtl8187_rfkill.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/rtl8187.h (renamed from drivers/net/wireless/rtl818x/rtl8187.h) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/rtl8225.c (renamed from drivers/net/wireless/rtl818x/rtl8187_rtl8225.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/rtl8225.h (renamed from drivers/net/wireless/rtl818x/rtl8187_rtl8225.h) | 0 |
21 files changed, 27 insertions, 22 deletions
diff --git a/drivers/net/wireless/rtl818x/Makefile b/drivers/net/wireless/rtl818x/Makefile index 93cbfbedb46d..997569076923 100644 --- a/drivers/net/wireless/rtl818x/Makefile +++ b/drivers/net/wireless/rtl818x/Makefile | |||
@@ -1,7 +1,2 @@ | |||
1 | rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o | 1 | obj-$(CONFIG_RTL8180) += rtl8180/ |
2 | rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o rtl8187_leds.o rtl8187_rfkill.o | 2 | obj-$(CONFIG_RTL8187) += rtl8187/ |
3 | |||
4 | obj-$(CONFIG_RTL8180) += rtl8180.o | ||
5 | obj-$(CONFIG_RTL8187) += rtl8187.o | ||
6 | |||
7 | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8180/Makefile b/drivers/net/wireless/rtl818x/rtl8180/Makefile new file mode 100644 index 000000000000..cb4fb8596f0b --- /dev/null +++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | rtl8180-objs := dev.o rtl8225.o sa2400.o max2820.o grf5101.o | ||
2 | |||
3 | obj-$(CONFIG_RTL8180) += rtl8180.o | ||
4 | |||
5 | ccflags-y += -Idrivers/net/wireless/rtl818x | ||
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 707c688da618..5851cbc1e957 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c | |||
@@ -24,10 +24,10 @@ | |||
24 | #include <net/mac80211.h> | 24 | #include <net/mac80211.h> |
25 | 25 | ||
26 | #include "rtl8180.h" | 26 | #include "rtl8180.h" |
27 | #include "rtl8180_rtl8225.h" | 27 | #include "rtl8225.h" |
28 | #include "rtl8180_sa2400.h" | 28 | #include "sa2400.h" |
29 | #include "rtl8180_max2820.h" | 29 | #include "max2820.h" |
30 | #include "rtl8180_grf5101.h" | 30 | #include "grf5101.h" |
31 | 31 | ||
32 | MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); | 32 | MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); |
33 | MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>"); | 33 | MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>"); |
diff --git a/drivers/net/wireless/rtl818x/rtl8180_grf5101.c b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c index 5cab9dfa8c07..5ee7589dd546 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_grf5101.c +++ b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <net/mac80211.h> | 25 | #include <net/mac80211.h> |
26 | 26 | ||
27 | #include "rtl8180.h" | 27 | #include "rtl8180.h" |
28 | #include "rtl8180_grf5101.h" | 28 | #include "grf5101.h" |
29 | 29 | ||
30 | static const int grf5101_encode[] = { | 30 | static const int grf5101_encode[] = { |
31 | 0x0, 0x8, 0x4, 0xC, | 31 | 0x0, 0x8, 0x4, 0xC, |
diff --git a/drivers/net/wireless/rtl818x/rtl8180_grf5101.h b/drivers/net/wireless/rtl818x/rtl8180/grf5101.h index 76647111bcff..76647111bcff 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_grf5101.h +++ b/drivers/net/wireless/rtl818x/rtl8180/grf5101.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8180_max2820.c b/drivers/net/wireless/rtl818x/rtl8180/max2820.c index 16c4655181c0..667b3363d437 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_max2820.c +++ b/drivers/net/wireless/rtl818x/rtl8180/max2820.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <net/mac80211.h> | 24 | #include <net/mac80211.h> |
25 | 25 | ||
26 | #include "rtl8180.h" | 26 | #include "rtl8180.h" |
27 | #include "rtl8180_max2820.h" | 27 | #include "max2820.h" |
28 | 28 | ||
29 | static const u32 max2820_chan[] = { | 29 | static const u32 max2820_chan[] = { |
30 | 12, /* CH 1 */ | 30 | 12, /* CH 1 */ |
diff --git a/drivers/net/wireless/rtl818x/rtl8180_max2820.h b/drivers/net/wireless/rtl818x/rtl8180/max2820.h index 61cf6d1e7d57..61cf6d1e7d57 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_max2820.h +++ b/drivers/net/wireless/rtl818x/rtl8180/max2820.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h index 30523314da43..30523314da43 100644 --- a/drivers/net/wireless/rtl818x/rtl8180.h +++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c index 69e4d4745dae..7c4574ba9d75 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c +++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <net/mac80211.h> | 21 | #include <net/mac80211.h> |
22 | 22 | ||
23 | #include "rtl8180.h" | 23 | #include "rtl8180.h" |
24 | #include "rtl8180_rtl8225.h" | 24 | #include "rtl8225.h" |
25 | 25 | ||
26 | static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data) | 26 | static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data) |
27 | { | 27 | { |
diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.h index 310013a2d726..310013a2d726 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.h +++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8180_sa2400.c b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c index d064fcc5ec08..44771a6286af 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_sa2400.c +++ b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <net/mac80211.h> | 25 | #include <net/mac80211.h> |
26 | 26 | ||
27 | #include "rtl8180.h" | 27 | #include "rtl8180.h" |
28 | #include "rtl8180_sa2400.h" | 28 | #include "sa2400.h" |
29 | 29 | ||
30 | static const u32 sa2400_chan[] = { | 30 | static const u32 sa2400_chan[] = { |
31 | 0x00096c, /* ch1 */ | 31 | 0x00096c, /* ch1 */ |
diff --git a/drivers/net/wireless/rtl818x/rtl8180_sa2400.h b/drivers/net/wireless/rtl818x/rtl8180/sa2400.h index a4aaa0d413f1..a4aaa0d413f1 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_sa2400.h +++ b/drivers/net/wireless/rtl818x/rtl8180/sa2400.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8187/Makefile b/drivers/net/wireless/rtl818x/rtl8187/Makefile new file mode 100644 index 000000000000..7b6299268ecf --- /dev/null +++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | rtl8187-objs := dev.o rtl8225.o leds.o rfkill.o | ||
2 | |||
3 | obj-$(CONFIG_RTL8187) += rtl8187.o | ||
4 | |||
5 | ccflags-y += -Idrivers/net/wireless/rtl818x | ||
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c index eeee244fcaab..6b82cac37ee3 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c | |||
@@ -29,11 +29,11 @@ | |||
29 | #include <net/mac80211.h> | 29 | #include <net/mac80211.h> |
30 | 30 | ||
31 | #include "rtl8187.h" | 31 | #include "rtl8187.h" |
32 | #include "rtl8187_rtl8225.h" | 32 | #include "rtl8225.h" |
33 | #ifdef CONFIG_RTL8187_LEDS | 33 | #ifdef CONFIG_RTL8187_LEDS |
34 | #include "rtl8187_leds.h" | 34 | #include "leds.h" |
35 | #endif | 35 | #endif |
36 | #include "rtl8187_rfkill.h" | 36 | #include "rfkill.h" |
37 | 37 | ||
38 | MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); | 38 | MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); |
39 | MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>"); | 39 | MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>"); |
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.c b/drivers/net/wireless/rtl818x/rtl8187/leds.c index 4637337d5ce6..2e0de2f5f0f9 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_leds.c +++ b/drivers/net/wireless/rtl818x/rtl8187/leds.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/eeprom_93cx6.h> | 20 | #include <linux/eeprom_93cx6.h> |
21 | 21 | ||
22 | #include "rtl8187.h" | 22 | #include "rtl8187.h" |
23 | #include "rtl8187_leds.h" | 23 | #include "leds.h" |
24 | 24 | ||
25 | static void led_turn_on(struct work_struct *work) | 25 | static void led_turn_on(struct work_struct *work) |
26 | { | 26 | { |
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.h b/drivers/net/wireless/rtl818x/rtl8187/leds.h index d743c96d4a20..d743c96d4a20 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_leds.h +++ b/drivers/net/wireless/rtl818x/rtl8187/leds.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c b/drivers/net/wireless/rtl818x/rtl8187/rfkill.c index 03555e1e0cab..34116719974a 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c +++ b/drivers/net/wireless/rtl818x/rtl8187/rfkill.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <net/mac80211.h> | 18 | #include <net/mac80211.h> |
19 | 19 | ||
20 | #include "rtl8187.h" | 20 | #include "rtl8187.h" |
21 | #include "rtl8187_rfkill.h" | 21 | #include "rfkill.h" |
22 | 22 | ||
23 | static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv) | 23 | static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv) |
24 | { | 24 | { |
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.h b/drivers/net/wireless/rtl818x/rtl8187/rfkill.h index e12575e96d11..e12575e96d11 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_rfkill.h +++ b/drivers/net/wireless/rtl818x/rtl8187/rfkill.h | |||
diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h index 98878160a65a..0d7b1423f77b 100644 --- a/drivers/net/wireless/rtl818x/rtl8187.h +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #define RTL8187_H | 16 | #define RTL8187_H |
17 | 17 | ||
18 | #include "rtl818x.h" | 18 | #include "rtl818x.h" |
19 | #include "rtl8187_leds.h" | 19 | #include "leds.h" |
20 | 20 | ||
21 | #define RTL8187_EEPROM_TXPWR_BASE 0x05 | 21 | #define RTL8187_EEPROM_TXPWR_BASE 0x05 |
22 | #define RTL8187_EEPROM_MAC_ADDR 0x07 | 22 | #define RTL8187_EEPROM_MAC_ADDR 0x07 |
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c index 5c6666f09ac1..908903f721f5 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <net/mac80211.h> | 21 | #include <net/mac80211.h> |
22 | 22 | ||
23 | #include "rtl8187.h" | 23 | #include "rtl8187.h" |
24 | #include "rtl8187_rtl8225.h" | 24 | #include "rtl8225.h" |
25 | 25 | ||
26 | static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data) | 26 | static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data) |
27 | { | 27 | { |
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.h b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.h index 20c5b6ead0f6..20c5b6ead0f6 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.h +++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.h | |||