From 7520a87031098436e861024297416895e6a30737 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Wed, 1 Jun 2011 13:45:42 +0200
Subject: [PATCH] --- yaml --- r: 259397 b: refs/heads/master c:
 583c3827f1b3d67d1443d8198d50c38d7bbb485c h: refs/heads/master i:   259395:
 89f39688df9b5fd05e0abc032d69eaf4a945dcac v: v3

---
 [refs]                                                        | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 1 +
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c          | 1 +
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h        | 4 ----
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1029cda49023..8a1ef4c630a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a0ec20d7b1beabec70c11220471118a5ec1acd
+refs/heads/master: 583c3827f1b3d67d1443d8198d50c38d7bbb485c
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
index f495d4bdfa1c..fbc9abd73799 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -16,6 +16,7 @@
 #include <linux/types.h>
 #include <linux/sched.h>	/* request_irq() */
 #include <linux/netdevice.h>
+#include <net/cfg80211.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index b023fc847faf..6ba50bbe611e 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -31,6 +31,7 @@
 #include <linux/fcntl.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
+#include <net/cfg80211.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
index 4bd039284686..33fb03acee51 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
@@ -17,10 +17,6 @@
 #ifndef _wl_cfg80211_h_
 #define _wl_cfg80211_h_
 
-#include <linux/wireless.h>
-#include <linux/wireless.h>
-#include <net/cfg80211.h>
-
 struct wl_conf;
 struct wl_iface;
 struct wl_priv;