---

yaml --- r: 158812 b: refs/heads/master c: e6f0b5c h: refs/heads/master v: v3
git-mirror · Jul 10, 2009 · b9bd62c · b9bd62c
1 parent 61a7d91
commit b9bd62c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 → .../drivers/net/wireless/wl12xx/wl1251_ops.c b/trunk/drivers/net/wireless/wl12xx/wl1251.c → .../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 → .../drivers/net/wireless/wl12xx/wl1251_ops.h b/trunk/drivers/net/wireless/wl12xx/wl1251.h → .../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>