diff --git a/[refs] b/[refs]
index 9cfdef31d765..8c9d4c3cef47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77cc9e43cee58303893f3a4fb8eaa2a3288c9c17
+refs/heads/master: e6f0b5c2993609c576a0c45e86f7e5b6dd0ae421
diff --git a/trunk/drivers/net/wireless/wl12xx/Makefile b/trunk/drivers/net/wireless/wl12xx/Makefile
index 7e05ea379979..bb2f2524a0bc 100644
--- a/trunk/drivers/net/wireless/wl12xx/Makefile
+++ b/trunk/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/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index a2aebac9fb82..3fc48c7c28c9 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/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/trunk/drivers/net/wireless/wl12xx/wl1251.c b/trunk/drivers/net/wireless/wl12xx/wl1251_ops.c
similarity index 99%
rename from trunk/drivers/net/wireless/wl12xx/wl1251.c
rename to trunk/drivers/net/wireless/wl12xx/wl1251_ops.c
index 77494a9046e5..126537f784b1 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251.c
+++ b/trunk/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/trunk/drivers/net/wireless/wl12xx/wl1251.h b/trunk/drivers/net/wireless/wl12xx/wl1251_ops.h
similarity index 98%
rename from trunk/drivers/net/wireless/wl12xx/wl1251.h
rename to trunk/drivers/net/wireless/wl12xx/wl1251_ops.h
index 1f4a44330394..74acf8e3df99 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251.h
+++ b/trunk/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>