From 1b4cce4de842b499c50f015a29563f54d515a90c Mon Sep 17 00:00:00 2001
From: Brett Rudley <brudley@broadcom.com>
Date: Fri, 1 Oct 2010 18:03:27 -0700
Subject: [PATCH] --- yaml --- r: 220047 b: refs/heads/master c:
 be217b54d712fe3e270e36c93c71129baaceb27f h: refs/heads/master i:   220045:
 f9456ddf020c24757e2ed23e32c659191a4faf7f   220043:
 8e5959d7603bf79a43758a07f4f7d425cccf15c4   220039:
 ce4a35b0db8a463a5498403cecd66cc9a9fbd18d   220031:
 43665b245f5e4d33e57a6dd41924b67beb6c6ce0 v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/sys/wl_mac80211.c       | 20 -------------------
 .../drivers/staging/brcm80211/sys/wlc_alloc.c |  7 -------
 .../drivers/staging/brcm80211/sys/wlc_ampdu.c |  3 ---
 .../staging/brcm80211/sys/wlc_antsel.c        |  6 ------
 .../drivers/staging/brcm80211/sys/wlc_event.c |  2 --
 .../staging/brcm80211/sys/wlc_mac80211.c      |  5 -----
 7 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/[refs] b/[refs]
index 980bc1bc600f..d7dbfcb0b6a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3327989a51f7d46d854c89bb6047dd68f843a7fd
+refs/heads/master: be217b54d712fe3e270e36c93c71129baaceb27f
diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
index 941b4a392bde..76cd2eb5b42a 100644
--- a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -19,42 +19,22 @@
 #include <typedefs.h>
 #include <linuxver.h>
 #include <osl.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
 #include <linux/string.h>
-#include <linux/ethtool.h>
-#include <linux/completion.h>
 #include <linux/pci_ids.h>
 #define WLC_MAXBSSCFG		1	/* single BSS configs */
 
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-#include <asm/unaligned.h>
 #include <wlc_cfg.h>
 #include <net/mac80211.h>
 #include <epivers.h>
 #ifndef WLC_HIGH_ONLY
 #include <phy_version.h>
 #endif
-#include <bcmendian.h>
 #include <bcmutils.h>
 #include <pcicfg.h>
 #include <wlioctl.h>
 #include <wlc_key.h>
-#include <proto/802.1d.h>	/* NUMPRIO & BE */
-#include <linux/proc_fs.h>
-#include <linux/vmalloc.h>
 #include <wlc_channel.h>
 #include <wlc_pub.h>
 #include <wlc_scb.h>
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c b/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
index 8aab6e369f53..e26c0534e3b1 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -16,22 +16,15 @@
 
 #include <wlc_cfg.h>
 #include <typedefs.h>
-#include <bcmdefs.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
-#include <proto/802.11.h>
-#include <proto/wpa.h>
 #include <wlioctl.h>
-#include <bcmwpa.h>
-#include <d11.h>
-#include <wlc_rate.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
-#include <wlc_bsscfg.h>
 #include <wlc_mac80211.h>
 #include <wlc_alloc.h>
 
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c
index 03612cd2e17d..ab97628348f0 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -22,16 +22,13 @@
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmendian.h>
-#include <proto/802.11.h>
 #include <wlioctl.h>
-#include <sbhndpio.h>
 #include <sbhnddma.h>
 #include <hnddma.h>
 #include <d11.h>
 #include <wlc_rate.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
-#include <wlc_bsscfg.h>
 #include <wlc_mac80211.h>
 #include <wlc_phy_hal.h>
 #include <wlc_antsel.h>
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_antsel.c b/trunk/drivers/staging/brcm80211/sys/wlc_antsel.c
index 9811dc41945a..106ee325ac79 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_antsel.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_antsel.c
@@ -19,24 +19,18 @@
 #ifdef WLANTSEL
 
 #include <typedefs.h>
-#include <qmath.h>
 #include <linux/kernel.h>
 #include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
-#include <bcmendian.h>
 #include <wlioctl.h>
-#include <wlc_phy_radio.h>
-#include <bitfuncs.h>
 
-#include <proto/802.11.h>
 #include <d11.h>
 #include <wlc_rate.h>
 #include <wlc_key.h>
 #include <wlc_pub.h>
-#include <wlc_bsscfg.h>
 #include <wl_dbg.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_event.c b/trunk/drivers/staging/brcm80211/sys/wlc_event.c
index ec3b80913b87..f0bc0c811d62 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_event.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_event.c
@@ -19,9 +19,7 @@
 #include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
-#include <bcmendian.h>
 #include <wlioctl.h>
-#include <wl_dbg.h>
 #include <wlc_cfg.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
index a8b251cc4423..1af6d91a22e2 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -25,17 +25,12 @@
 #include <bcmwifi.h>
 #include <siutils.h>
 #include <bcmendian.h>
-#include <proto/802.1d.h>
-#include <proto/802.11.h>
 #include <proto/wpa.h>
-#include <hndsoc.h>
-#include <sbchipc.h>
 #include <pcicfg.h>
 #include <bcmsrom.h>
 #include <wlioctl.h>
 #include <epivers.h>
 #include <bcmwpa.h>
-#include <sbhndpio.h>
 #include <sbhnddma.h>
 #include <hnddma.h>
 #include <hndpmu.h>