From 82febabab233946d385607dc301c9d1eb8181900 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 7 Jan 2009 17:32:58 +0200
Subject: [PATCH] --- yaml --- r: 141145 b: refs/heads/master c:
 7e797abfb8b69c9e270e65f7318942948aab5598 h: refs/heads/master i:   141143:
 e9004d417f950b5b0c5884e502bdbb7d1a4b8b81 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/winbond/mds.c             | 2 +-
 trunk/drivers/staging/winbond/mlmetxrx.c        | 2 +-
 trunk/drivers/staging/winbond/mto.c             | 2 +-
 trunk/drivers/staging/winbond/os_common.h       | 2 --
 trunk/drivers/staging/winbond/phy_calibration.c | 2 +-
 trunk/drivers/staging/winbond/reg.c             | 2 +-
 trunk/drivers/staging/winbond/wbhal.c           | 2 +-
 8 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 trunk/drivers/staging/winbond/os_common.h

diff --git a/[refs] b/[refs]
index 71a9f7bb3379..de5c8c555fe7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b93abb660abfc13f7f03065fa1fc77c825762a68
+refs/heads/master: 7e797abfb8b69c9e270e65f7318942948aab5598
diff --git a/trunk/drivers/staging/winbond/mds.c b/trunk/drivers/staging/winbond/mds.c
index e431406e25a6..8b638d7b1325 100644
--- a/trunk/drivers/staging/winbond/mds.c
+++ b/trunk/drivers/staging/winbond/mds.c
@@ -3,7 +3,7 @@
 #include "mds_f.h"
 #include "mlmetxrx_f.h"
 #include "mto_f.h"
-#include "os_common.h"
+#include "sysdef.h"
 #include "wbhal_f.h"
 #include "wblinux_f.h"
 
diff --git a/trunk/drivers/staging/winbond/mlmetxrx.c b/trunk/drivers/staging/winbond/mlmetxrx.c
index 07802afd2b87..643ceb060d56 100644
--- a/trunk/drivers/staging/winbond/mlmetxrx.c
+++ b/trunk/drivers/staging/winbond/mlmetxrx.c
@@ -15,7 +15,7 @@
 //
 //  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
 //============================================================================
-#include "os_common.h"
+#include "sysdef.h"
 
 #include "mds_f.h"
 
diff --git a/trunk/drivers/staging/winbond/mto.c b/trunk/drivers/staging/winbond/mto.c
index de11a05efae2..7718423280ed 100644
--- a/trunk/drivers/staging/winbond/mto.c
+++ b/trunk/drivers/staging/winbond/mto.c
@@ -22,7 +22,7 @@
 //============================================================================
 
 // LA20040210_DTO kevin
-#include "os_common.h"
+#include "sysdef.h"
 #include "sme_api.h"
 #include "gl_80211.h"
 #include "wbhal_f.h"
diff --git a/trunk/drivers/staging/winbond/os_common.h b/trunk/drivers/staging/winbond/os_common.h
deleted file mode 100644
index 2c276e3ab512..000000000000
--- a/trunk/drivers/staging/winbond/os_common.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "sysdef.h"
-
diff --git a/trunk/drivers/staging/winbond/phy_calibration.c b/trunk/drivers/staging/winbond/phy_calibration.c
index 6782552d366c..b56a2a94961e 100644
--- a/trunk/drivers/staging/winbond/phy_calibration.c
+++ b/trunk/drivers/staging/winbond/phy_calibration.c
@@ -10,7 +10,7 @@
  */
 
 /****************** INCLUDE FILES SECTION ***********************************/
-#include "os_common.h"
+#include "sysdef.h"
 #include "phy_calibration.h"
 #include "wbhal_f.h"
 
diff --git a/trunk/drivers/staging/winbond/reg.c b/trunk/drivers/staging/winbond/reg.c
index cd21272d7a9f..c365c5d1b765 100644
--- a/trunk/drivers/staging/winbond/reg.c
+++ b/trunk/drivers/staging/winbond/reg.c
@@ -1,4 +1,4 @@
-#include "os_common.h"
+#include "sysdef.h"
 #include "wbhal_f.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/trunk/drivers/staging/winbond/wbhal.c b/trunk/drivers/staging/winbond/wbhal.c
index 8a9d21cbb0c0..d7bbb9a40ef6 100644
--- a/trunk/drivers/staging/winbond/wbhal.c
+++ b/trunk/drivers/staging/winbond/wbhal.c
@@ -1,4 +1,4 @@
-#include "os_common.h"
+#include "sysdef.h"
 #include "wbhal_f.h"
 #include "wblinux_f.h"