From b359c748044b5cd8634a7a4513bcd37d7226980b Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Wed, 1 Jun 2011 13:45:36 +0200
Subject: [PATCH] --- yaml --- r: 259391 b: refs/heads/master c:
 7c6100ee08c1583e771a7ce19408273eafb31583 h: refs/heads/master i:   259389:
 7554c1b27c5da631ce41aa23307fad27b764d95a   259387:
 31cd7264b3e710c775e1330ee883ba569980c5ad   259383:
 582af2f81b94c774fb9ce68dd8c9c0ceee3d86fa   259375:
 4084dec5a2dfc6e0160addf88d1533221b1f256f   259359:
 66d29aad23c5de6d3b296376f0271e62b0ab7575   259327:
 b163d0e2bd0d3e5c8f7674b5b77524ec00828895 v: v3

---
 [refs]                                          |  2 +-
 .../drivers/staging/brcm80211/brcmfmac/bcmsdh.c |  2 ++
 .../staging/brcm80211/brcmfmac/bcmsdh_linux.c   |  4 ++--
 .../staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c   |  1 +
 .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c     |  1 +
 trunk/drivers/staging/brcm80211/brcmfmac/dhd.h  | 17 -----------------
 .../staging/brcm80211/brcmfmac/dhd_cdc.c        |  2 ++
 .../staging/brcm80211/brcmfmac/dhd_common.c     |  3 +++
 .../brcm80211/brcmfmac/dhd_custom_gpio.c        |  3 +++
 .../staging/brcm80211/brcmfmac/dhd_linux.c      |  1 +
 .../staging/brcm80211/brcmfmac/dhd_sdio.c       |  3 +++
 .../staging/brcm80211/brcmfmac/wl_cfg80211.c    |  3 +++
 .../drivers/staging/brcm80211/brcmfmac/wl_iw.c  |  2 ++
 13 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 3926eb34cb77..9906b3304419 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bccf92c5a815137cbd7ec2ca7d02833f153d640
+refs/heads/master: 7c6100ee08c1583e771a7ce19408273eafb31583
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index e11c615d7494..b8af4edea007 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -18,9 +18,11 @@
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/pci_ids.h>
+#include <linux/sched.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
+#include <bcmwifi.h>
 #include <bcmsoc.h>
 
 #include <bcmsdh.h>		/* BRCM API for SDIO
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index d44150067c6a..c0b9330aa4c4 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -23,16 +23,16 @@
 #include <linux/netdevice.h>
 #include <linux/pci.h>
 #include <linux/completion.h>
+#include <linux/sched.h>
 
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
+#include <bcmwifi.h>
 
 #if defined(OOB_INTR_ONLY)
 #include <linux/irq.h>
 extern void dhdsdio_isr(void *args);
-#include <dngl_stats.h>
-#include <dhd.h>
 #endif				/* defined(OOB_INTR_ONLY) */
 #if defined(CONFIG_MACH_SANDGATE2G) || defined(CONFIG_MACH_LOGICPD_PXA270)
 #if !defined(BCMPLATFORM_BUS)
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index cc4738a4ae24..067404bbb91d 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -18,6 +18,7 @@
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
+#include <bcmwifi.h>
 #include <sdio.h>		/* SDIO Device and Protocol Specs */
 #include <sdioh.h>		/* SDIO Host Controller Specification */
 #include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
index 2792a4dfe651..196b15e2557c 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -18,6 +18,7 @@
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
+#include <bcmwifi.h>
 #include <sdio.h>		/* SDIO Specs */
 #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.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
index 081cda038650..1fc52023a3d6 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -21,23 +21,6 @@
 #ifndef _dhd_h_
 #define _dhd_h_
 
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/random.h>
-#include <linux/spinlock.h>
-#include <linux/ethtool.h>
-#include <linux/suspend.h>
-#include <asm/uaccess.h>
-#include <asm/unaligned.h>
-#include "bcmdefs.h"
-/* The kernel threading is sdio-specific */
-#include "bcmwifi.h"
-
 /* Forward decls */
 struct dhd_bus;
 struct dhd_prot;
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 424eacbe3f2b..f655322762a6 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -16,9 +16,11 @@
 
 #include <linux/types.h>
 #include <linux/netdevice.h>
+#include <linux/sched.h>
 #include <bcmdefs.h>
 
 #include <bcmutils.h>
+#include <bcmwifi.h>
 
 #include <dngl_stats.h>
 #include <dhd.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 85d87db93b22..79df12529646 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -15,8 +15,11 @@
  */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/sched.h>
 #include <bcmdefs.h>
+#include <bcmwifi.h>
 #include <linux/netdevice.h>
+#include <asm/unaligned.h>
 #include <bcmutils.h>
 #include <dngl_stats.h>
 #include <dhd.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index abd41e3ffca1..a3ea4159f048 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -15,7 +15,10 @@
  */
 
 #include <linux/netdevice.h>
+#include <linux/sched.h>
 #include <bcmutils.h>
+#include <bcmdefs.h>
+#include <bcmwifi.h>
 
 #include <dngl_stats.h>
 #include <dhd.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index f356c564cfb9..b023fc847faf 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -33,6 +33,7 @@
 #include <linux/uaccess.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
+#include <bcmwifi.h>
 
 #include <dngl_stats.h>
 #include <dhd.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 70a1fc30b54a..38a3e1774fe3 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -19,10 +19,13 @@
 #include <linux/printk.h>
 #include <linux/pci_ids.h>
 #include <linux/netdevice.h>
+#include <linux/sched.h>
+#include <asm/unaligned.h>
 #include <bcmdefs.h>
 #include <bcmsdh.h>
 
 #include <bcmdefs.h>
+#include <bcmwifi.h>
 #include <bcmutils.h>
 #include <bcmdevs.h>
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 88144d46bd5b..763ccde0490c 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,8 +16,11 @@
 
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
+#include <linux/sched.h>
 
 #include <bcmutils.h>
+#include <bcmdefs.h>
+#include <bcmwifi.h>
 
 #include <asm/uaccess.h>
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 9819a357d887..da052e7edbd5 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -18,8 +18,10 @@
 #include <linux/semaphore.h>
 #include <bcmdefs.h>
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 
 #include <bcmutils.h>
+#include <bcmwifi.h>
 
 #include <linux/if_arp.h>
 #include <asm/uaccess.h>