diff options
-rw-r--r-- | drivers/net/wireless/wl12xx/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_ops.c (renamed from drivers/net/wireless/wl12xx/wl1251.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_ops.h (renamed from drivers/net/wireless/wl12xx/wl1251.h) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile index 7e05ea37997..bb2f2524a0b 100644 --- a/drivers/net/wireless/wl12xx/Makefile +++ b/drivers/net/wireless/wl12xx/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | wl12xx-objs = main.o spi.o event.o wl1251_tx.o rx.o \ | 1 | wl12xx-objs = main.o spi.o event.o wl1251_tx.o rx.o \ |
2 | ps.o cmd.o acx.o boot.o init.o wl1251.o \ | 2 | ps.o cmd.o acx.o boot.o init.o wl1251_ops.o \ |
3 | debugfs.o | 3 | debugfs.o |
4 | obj-$(CONFIG_WL12XX) += wl12xx.o | 4 | obj-$(CONFIG_WL12XX) += wl12xx.o |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index a2aebac9fb8..3fc48c7c28c 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "wl12xx.h" | 34 | #include "wl12xx.h" |
35 | #include "wl12xx_80211.h" | 35 | #include "wl12xx_80211.h" |
36 | #include "reg.h" | 36 | #include "reg.h" |
37 | #include "wl1251.h" | 37 | #include "wl1251_ops.h" |
38 | #include "spi.h" | 38 | #include "spi.h" |
39 | #include "event.h" | 39 | #include "event.h" |
40 | #include "wl1251_tx.h" | 40 | #include "wl1251_tx.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251.c b/drivers/net/wireless/wl12xx/wl1251_ops.c index 77494a9046e..126537f784b 100644 --- a/drivers/net/wireless/wl12xx/wl1251.c +++ b/drivers/net/wireless/wl12xx/wl1251_ops.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | 26 | ||
27 | #include "wl1251.h" | 27 | #include "wl1251_ops.h" |
28 | #include "reg.h" | 28 | #include "reg.h" |
29 | #include "spi.h" | 29 | #include "spi.h" |
30 | #include "boot.h" | 30 | #include "boot.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251_ops.h index 1f4a4433039..74acf8e3df9 100644 --- a/drivers/net/wireless/wl12xx/wl1251.h +++ b/drivers/net/wireless/wl12xx/wl1251_ops.h | |||
@@ -21,8 +21,8 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef __WL1251_H__ | 24 | #ifndef __WL1251_OPS_H__ |
25 | #define __WL1251_H__ | 25 | #define __WL1251_OPS_H__ |
26 | 26 | ||
27 | #include <linux/bitops.h> | 27 | #include <linux/bitops.h> |
28 | 28 | ||