summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-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 7e05ea37997..bb2f2524a0b 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 a2aebac9fb8..3fc48c7c28c 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 77494a9046e..126537f784b 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 1f4a4433039..74acf8e3df9 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>