From 32bc2ec59c99ab80177a78e17cabf9839da81b8e Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 1 Nov 2010 21:50:06 +0200
Subject: [PATCH] --- yaml --- r: 228013 b: refs/heads/master c:
 b5ef076141acc223e55aa298abd2d2f5fb844874 h: refs/heads/master i:   228011:
 e441eec17b7c520053fa44ae513d35a973920272 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/winbond/core.h                 | 2 +-
 trunk/drivers/staging/winbond/mds.c                  | 2 +-
 trunk/drivers/staging/winbond/mds_f.h                | 2 +-
 trunk/drivers/staging/winbond/mto.c                  | 2 +-
 trunk/drivers/staging/winbond/phy_calibration.c      | 2 +-
 trunk/drivers/staging/winbond/phy_calibration.h      | 2 +-
 trunk/drivers/staging/winbond/reg.c                  | 2 +-
 trunk/drivers/staging/winbond/wb35reg_f.h            | 2 +-
 trunk/drivers/staging/winbond/wb35rx_f.h             | 2 +-
 trunk/drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 0
 trunk/drivers/staging/winbond/wbusb.c                | 2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename trunk/drivers/staging/winbond/{wbhal_s.h => wbhal.h} (100%)

diff --git a/[refs] b/[refs]
index 037d4e33919f..fe141db785ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72ca8819f7f4ac4ddf82ab72ee614075821a3d00
+refs/heads/master: b5ef076141acc223e55aa298abd2d2f5fb844874
diff --git a/trunk/drivers/staging/winbond/core.h b/trunk/drivers/staging/winbond/core.h
index 2b87a0007319..d7b3aca5ddeb 100644
--- a/trunk/drivers/staging/winbond/core.h
+++ b/trunk/drivers/staging/winbond/core.h
@@ -4,7 +4,7 @@
 #include <linux/wireless.h>
 #include <linux/types.h>
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "mto.h"
 
 #include "mac_structures.h"
diff --git a/trunk/drivers/staging/winbond/mds.c b/trunk/drivers/staging/winbond/mds.c
index 2128e6e6ff5a..9ac2c874ef05 100644
--- a/trunk/drivers/staging/winbond/mds.c
+++ b/trunk/drivers/staging/winbond/mds.c
@@ -2,7 +2,7 @@
 #include "mlmetxrx_f.h"
 #include "mto.h"
 #include "sysdef.h"
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "wblinux_f.h"
 #include "wb35tx_f.h"
 
diff --git a/trunk/drivers/staging/winbond/mds_f.h b/trunk/drivers/staging/winbond/mds_f.h
index 7f68deae6d04..d902843e8aed 100644
--- a/trunk/drivers/staging/winbond/mds_f.h
+++ b/trunk/drivers/staging/winbond/mds_f.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_MDS_F_H
 #define __WINBOND_MDS_F_H
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "core.h"
 
 unsigned char Mds_initial(struct wbsoft_priv *adapter);
diff --git a/trunk/drivers/staging/winbond/mto.c b/trunk/drivers/staging/winbond/mto.c
index 05d12625dfcd..1faebceceff7 100644
--- a/trunk/drivers/staging/winbond/mto.c
+++ b/trunk/drivers/staging/winbond/mto.c
@@ -19,7 +19,7 @@
 
 #include "sysdef.h"
 #include "sme_api.h"
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "wb35reg_f.h"
 #include "core.h"
 
diff --git a/trunk/drivers/staging/winbond/phy_calibration.c b/trunk/drivers/staging/winbond/phy_calibration.c
index 08cec74bdad7..0658b09c7853 100644
--- a/trunk/drivers/staging/winbond/phy_calibration.c
+++ b/trunk/drivers/staging/winbond/phy_calibration.c
@@ -12,7 +12,7 @@
 /****************** INCLUDE FILES SECTION ***********************************/
 #include "sysdef.h"
 #include "phy_calibration.h"
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "wb35reg_f.h"
 #include "core.h"
 
diff --git a/trunk/drivers/staging/winbond/phy_calibration.h b/trunk/drivers/staging/winbond/phy_calibration.h
index 9fcdab137cb3..84f6e840a47a 100644
--- a/trunk/drivers/staging/winbond/phy_calibration.h
+++ b/trunk/drivers/staging/winbond/phy_calibration.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_PHY_CALIBRATION_H
 #define __WINBOND_PHY_CALIBRATION_H
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 
 #define REG_AGC_CTRL1		0x1000
 #define REG_AGC_CTRL2		0x1004
diff --git a/trunk/drivers/staging/winbond/reg.c b/trunk/drivers/staging/winbond/reg.c
index 8df05c4d26ff..439d213fe951 100644
--- a/trunk/drivers/staging/winbond/reg.c
+++ b/trunk/drivers/staging/winbond/reg.c
@@ -1,5 +1,5 @@
 #include "sysdef.h"
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "wb35reg_f.h"
 #include "core.h"
 
diff --git a/trunk/drivers/staging/winbond/wb35reg_f.h b/trunk/drivers/staging/winbond/wb35reg_f.h
index bf23c1084199..95dc98096845 100644
--- a/trunk/drivers/staging/winbond/wb35reg_f.h
+++ b/trunk/drivers/staging/winbond/wb35reg_f.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_WB35REG_F_H
 #define __WINBOND_WB35REG_F_H
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 
 /*
  * ====================================
diff --git a/trunk/drivers/staging/winbond/wb35rx_f.h b/trunk/drivers/staging/winbond/wb35rx_f.h
index 98acce517d90..1fdf65ea6041 100644
--- a/trunk/drivers/staging/winbond/wb35rx_f.h
+++ b/trunk/drivers/staging/winbond/wb35rx_f.h
@@ -2,7 +2,7 @@
 #define __WINBOND_WB35RX_F_H
 
 #include <net/mac80211.h>
-#include "wbhal_s.h"
+#include "wbhal.h"
 
 //====================================
 // Interface function declare
diff --git a/trunk/drivers/staging/winbond/wbhal_s.h b/trunk/drivers/staging/winbond/wbhal.h
similarity index 100%
rename from trunk/drivers/staging/winbond/wbhal_s.h
rename to trunk/drivers/staging/winbond/wbhal.h
diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
index a053bbb39610..df055abf5c42 100644
--- a/trunk/drivers/staging/winbond/wbusb.c
+++ b/trunk/drivers/staging/winbond/wbusb.c
@@ -16,7 +16,7 @@
 #include "mds_f.h"
 #include "mlmetxrx_f.h"
 #include "mto.h"
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "wb35reg_f.h"
 #include "wb35tx_f.h"
 #include "wb35rx_f.h"