From ad2329503ae4ebdbf5b8dfba12945ee5ec16e5c8 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Wed, 1 Jun 2011 13:45:43 +0200
Subject: [PATCH] --- yaml --- r: 259398 b: refs/heads/master c:
 b64f7a667569f8773278b72e285272c93b504c15 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8a1ef4c630a4..c715198e74c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 583c3827f1b3d67d1443d8198d50c38d7bbb485c
+refs/heads/master: b64f7a667569f8773278b72e285272c93b504c15
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index a3ea4159f048..a94233376547 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -23,8 +23,6 @@
 #include <dngl_stats.h>
 #include <dhd.h>
 
-#include <wl_iw.h>
-
 #define WL_ERROR(fmt, args...) printk(fmt, ##args)
 #define WL_TRACE(fmt, args...) no_printk(fmt, ##args)
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index da052e7edbd5..47960de51be8 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -19,6 +19,7 @@
 #include <bcmdefs.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/wireless.h>
 
 #include <bcmutils.h>
 #include <bcmwifi.h>
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
index c92a8b5c59c3..aa8902cd6b30 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
@@ -17,8 +17,6 @@
 #ifndef _wl_iw_h_
 #define _wl_iw_h_
 
-#include <linux/wireless.h>
-
 #define WL_SCAN_PARAMS_SSID_MAX	10
 #define GET_SSID	"SSID="
 #define GET_CHANNEL	"CH="