summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-06-12 11:16:58 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 18:57:48 (GMT)
commite6f0b5c2993609c576a0c45e86f7e5b6dd0ae421 (patch)
tree52856910649d468be8ece4f66d3635c81e378e0a /drivers/net/wireless/wl12xx
parent77cc9e43cee58303893f3a4fb8eaa2a3288c9c17 (diff)
downloadlinux-fsl-qoriq-e6f0b5c2993609c576a0c45e86f7e5b6dd0ae421.tar.xz
wl12xx: rename wl1251.c wl1251_ops.c
In preparation to split wl12xx to wl1251 and wl1271. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r--drivers/net/wireless/wl12xx/Makefile2
-rw-r--r--drivers/net/wireless/wl12xx/main.c2
-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 7e05ea3..bb2f252 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -1,4 +1,4 @@
wl12xx-objs = main.o spi.o event.o wl1251_tx.o rx.o \
- ps.o cmd.o acx.o boot.o init.o wl1251.o \
+ ps.o cmd.o acx.o boot.o init.o wl1251_ops.o \
debugfs.o
obj-$(CONFIG_WL12XX) += wl12xx.o
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index a2aebac..3fc48c7 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -34,7 +34,7 @@
#include "wl12xx.h"
#include "wl12xx_80211.h"
#include "reg.h"
-#include "wl1251.h"
+#include "wl1251_ops.h"
#include "spi.h"
#include "event.h"
#include "wl1251_tx.h"
diff --git a/drivers/net/wireless/wl12xx/wl1251.c b/drivers/net/wireless/wl12xx/wl1251_ops.c
index 77494a9..126537f 100644
--- a/drivers/net/wireless/wl12xx/wl1251.c
+++ b/drivers/net/wireless/wl12xx/wl1251_ops.c
@@ -24,7 +24,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include "wl1251.h"
+#include "wl1251_ops.h"
#include "reg.h"
#include "spi.h"
#include "boot.h"
diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251_ops.h
index 1f4a443..74acf8e 100644
--- a/drivers/net/wireless/wl12xx/wl1251.h
+++ b/drivers/net/wireless/wl12xx/wl1251_ops.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef __WL1251_H__
-#define __WL1251_H__
+#ifndef __WL1251_OPS_H__
+#define __WL1251_OPS_H__
#include <linux/bitops.h>