diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 7e05ea37997928237786509092e9f05d66ecb21b..bb2f2524a0bcb4eb4f003fa9d339dff8e71030fe 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 a2aebac9fb8202c170c566eb9fe7706f0210306f..3fc48c7c28c9cf024180e765565c9cc11954263c 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
similarity index 99%
rename from drivers/net/wireless/wl12xx/wl1251.c
rename to drivers/net/wireless/wl12xx/wl1251_ops.c
index 77494a9046e570b817008783a74c3280b68bd9aa..126537f784b1a7d17e964351a35dceeafdfb46a3 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
similarity index 98%
rename from drivers/net/wireless/wl12xx/wl1251.h
rename to drivers/net/wireless/wl12xx/wl1251_ops.h
index 1f4a44330394a731fe3a2f23349d2976f60fe9d1..74acf8e3df99b1bf6a3b7e7600d19bd8c3180005 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>