From e2cca4fc0e9174566c4ca23cb04676eb92f68e7e Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Wed, 1 Jun 2011 13:46:02 +0200
Subject: [PATCH] --- yaml --- r: 259417 b: refs/heads/master c:
 c55a12234663125bf8c4183e27f1ca71bd19ca1e h: refs/heads/master i:   259415:
 0e7e408cbb262a03f29d2e42415cd56b518a6e05 v: v3

---
 [refs]                                                        | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h           | 2 ++
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c             | 2 --
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c       | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c       | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c           | 4 +---
 .../staging/brcm80211/{include => brcmfmac}/sdio_host.h       | 0
 8 files changed, 7 insertions(+), 9 deletions(-)
 rename trunk/drivers/staging/brcm80211/{include => brcmfmac}/sdio_host.h (100%)

diff --git a/[refs] b/[refs]
index e0a5c8808647..c1047c5cd8cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c54f52f60a8e92d98b9df0579c93f73a8d382ca9
+refs/heads/master: c55a12234663125bf8c4183e27f1ca71bd19ca1e
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
index 53c32915acc9..e9da1ce13fa7 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
@@ -17,6 +17,8 @@
 #ifndef	_sdio_api_h_
 #define	_sdio_api_h_
 
+#include "sdio_host.h"
+
 #define SDIOH_API_RC_SUCCESS                          (0x00)
 #define SDIOH_API_RC_FAIL	                      (0x01)
 #define SDIOH_API_SUCCESS(status) (status == 0)
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index d6e90d70eb86..b3bdd489a9fd 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -25,8 +25,6 @@
 #include <brcmu_wifi.h>
 #include <soc.h>
 
-#include <sdio_host.h>		/* BRCM API for SDIO
-			 clients (such as wl, dhd) */
 #include <bcmsdbus.h>		/* common SDIO/controller interface */
 #include <sbsdio.h>		/* BRCM sdio device core */
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 37cf61aca6c4..71ef23a9f47b 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -28,8 +28,8 @@
 #include <defs.h>
 #include <brcm_hw_ids.h>
 #include <brcmu_utils.h>
-#include <sdio_host.h>
 #include <brcmu_wifi.h>
+#include "sdio_host.h"
 
 #if defined(OOB_INTR_ONLY)
 #include <linux/irq.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 03a5966fc30b..66e204b60b63 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -20,7 +20,7 @@
 #include <brcm_hw_ids.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
-#include <sdio_host.h>
+#include "sdio_host.h"
 #include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */
 #include <sdiovar.h>		/* ioctl/iovars */
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
index 85ed0958b9c3..9fc491dff018 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -20,7 +20,7 @@
 #include <defs.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
-#include <sdio_host.h>
+#include "sdio_host.h"
 #include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */
 #include <sdiovar.h>		/* to get msglevel bit values */
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 4f5ab69ec7fc..330703bb3346 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -23,9 +23,7 @@
 #include <linux/mmc/sdio.h>
 #include <asm/unaligned.h>
 #include <defs.h>
-#include <sdio_host.h>
-
-#include <defs.h>
+#include "sdio_host.h"
 #include <brcmu_wifi.h>
 #include <brcmu_utils.h>
 #include <brcm_hw_ids.h>
diff --git a/trunk/drivers/staging/brcm80211/include/sdio_host.h b/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/sdio_host.h
rename to trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h