From bcf84f48c4cc348c749f989ec4eacfcb1ae3e294 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 5 Oct 2010 09:31:19 -0700
Subject: [PATCH] --- yaml --- r: 220051 b: refs/heads/master c:
 b79375827d931dba8eee3ff4e38b243e24d26b5c h: refs/heads/master i:   220049:
 a5d128a14cc9b3bf68bdc2855c3982cdb036b47e   220047:
 1b4cce4de842b499c50f015a29563f54d515a90c v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/staging/brcm80211/include/msgtrace.h       | 2 --
 trunk/drivers/staging/brcm80211/include/proto/802.11.h   | 4 ----
 trunk/drivers/staging/brcm80211/include/proto/bcmeth.h   | 3 ---
 trunk/drivers/staging/brcm80211/include/proto/bcmevent.h | 3 ---
 trunk/drivers/staging/brcm80211/include/proto/bcmip.h    | 3 ---
 trunk/drivers/staging/brcm80211/include/proto/ethernet.h | 2 --
 trunk/drivers/staging/brcm80211/include/proto/vlan.h     | 3 ---
 8 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index cfafa8b7ca01..8486411586e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea4381ffb8d72c66ebfaa36c146952c3b302432b
+refs/heads/master: b79375827d931dba8eee3ff4e38b243e24d26b5c
diff --git a/trunk/drivers/staging/brcm80211/include/msgtrace.h b/trunk/drivers/staging/brcm80211/include/msgtrace.h
index cfae9a69a651..218e43ce2ece 100644
--- a/trunk/drivers/staging/brcm80211/include/msgtrace.h
+++ b/trunk/drivers/staging/brcm80211/include/msgtrace.h
@@ -17,9 +17,7 @@
 #ifndef	_MSGTRACE_H
 #define	_MSGTRACE_H
 
-#ifndef _TYPEDEFS_H_
 #include <typedefs.h>
-#endif
 
 /* This marks the start of a packed structure section. */
 #include <packed_section_start.h>
diff --git a/trunk/drivers/staging/brcm80211/include/proto/802.11.h b/trunk/drivers/staging/brcm80211/include/proto/802.11.h
index ef40ff2b98ff..9d7c14ccbdbe 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/802.11.h
@@ -17,12 +17,8 @@
 #ifndef _802_11_H_
 #define _802_11_H_
 
-#ifndef _TYPEDEFS_H_
 #include <typedefs.h>
-#endif
-
 #include <proto/wpa.h>
-
 #include <packed_section_start.h>
 
 #define DOT11_A3_HDR_LEN		24
diff --git a/trunk/drivers/staging/brcm80211/include/proto/bcmeth.h b/trunk/drivers/staging/brcm80211/include/proto/bcmeth.h
index 13653ed28ce0..3ed5ab8898a3 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/bcmeth.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/bcmeth.h
@@ -17,10 +17,7 @@
 #ifndef _BCMETH_H_
 #define _BCMETH_H_
 
-#ifndef _TYPEDEFS_H_
 #include <typedefs.h>
-#endif
-
 #include <packed_section_start.h>
 
 #define	BCMILCP_SUBTYPE_RATE		1
diff --git a/trunk/drivers/staging/brcm80211/include/proto/bcmevent.h b/trunk/drivers/staging/brcm80211/include/proto/bcmevent.h
index b2dde61d18ef..a5434f89969b 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/bcmevent.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/bcmevent.h
@@ -17,10 +17,7 @@
 #ifndef _BCMEVENT_H_
 #define _BCMEVENT_H_
 
-#ifndef _TYPEDEFS_H_
 #include <typedefs.h>
-#endif
-
 #include <packed_section_start.h>
 
 #define BCM_EVENT_MSG_VERSION		1
diff --git a/trunk/drivers/staging/brcm80211/include/proto/bcmip.h b/trunk/drivers/staging/brcm80211/include/proto/bcmip.h
index d9d6e8ef809f..738f7cd2e08c 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/bcmip.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/bcmip.h
@@ -17,10 +17,7 @@
 #ifndef _bcmip_h_
 #define _bcmip_h_
 
-#ifndef _TYPEDEFS_H_
 #include <typedefs.h>
-#endif
-
 #include <packed_section_start.h>
 
 #define IP_VER_OFFSET		0x0
diff --git a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h
index 9ce8de8cd44c..dca37a4e7bc4 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -17,9 +17,7 @@
 #ifndef _NET_ETHERNET_H_
 #define _NET_ETHERNET_H_
 
-#ifndef _TYPEDEFS_H_
 #include "typedefs.h"
-#endif
 #include <packed_section_start.h>
 
 #define	ETHER_ADDR_LEN		6
diff --git a/trunk/drivers/staging/brcm80211/include/proto/vlan.h b/trunk/drivers/staging/brcm80211/include/proto/vlan.h
index 1dcd3f32582b..be72c3ad84cf 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/vlan.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/vlan.h
@@ -17,10 +17,7 @@
 #ifndef _vlan_h_
 #define _vlan_h_
 
-#ifndef _TYPEDEFS_H_
 #include <typedefs.h>
-#endif
-
 #include <packed_section_start.h>
 
 #define VLAN_VID_MASK		0xfff