summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 09:31:19 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 09:31:19 -0700
commitb79375827d931dba8eee3ff4e38b243e24d26b5c (patch)
tree541f7edf1b10d21e513f3a9b4970f4b49a7e2f2e
parentea4381ffb8d72c66ebfaa36c146952c3b302432b (diff)
downloadop-kernel-dev-b79375827d931dba8eee3ff4e38b243e24d26b5c.zip
op-kernel-dev-b79375827d931dba8eee3ff4e38b243e24d26b5c.tar.gz
Staging: brcm80211: remove unneeded #ifdef checks
For a .h file, you never need to check it, the .h file does it itself. For the typedef.h file, this is never needed. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/include/msgtrace.h2
-rw-r--r--drivers/staging/brcm80211/include/proto/802.11.h4
-rw-r--r--drivers/staging/brcm80211/include/proto/bcmeth.h3
-rw-r--r--drivers/staging/brcm80211/include/proto/bcmevent.h3
-rw-r--r--drivers/staging/brcm80211/include/proto/bcmip.h3
-rw-r--r--drivers/staging/brcm80211/include/proto/ethernet.h2
-rw-r--r--drivers/staging/brcm80211/include/proto/vlan.h3
7 files changed, 0 insertions, 20 deletions
diff --git a/drivers/staging/brcm80211/include/msgtrace.h b/drivers/staging/brcm80211/include/msgtrace.h
index cfae9a6..218e43c 100644
--- a/drivers/staging/brcm80211/include/msgtrace.h
+++ b/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/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h
index ef40ff2..9d7c14c 100644
--- a/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/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/drivers/staging/brcm80211/include/proto/bcmeth.h b/drivers/staging/brcm80211/include/proto/bcmeth.h
index 13653ed..3ed5ab8 100644
--- a/drivers/staging/brcm80211/include/proto/bcmeth.h
+++ b/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/drivers/staging/brcm80211/include/proto/bcmevent.h b/drivers/staging/brcm80211/include/proto/bcmevent.h
index b2dde61..a5434f8 100644
--- a/drivers/staging/brcm80211/include/proto/bcmevent.h
+++ b/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/drivers/staging/brcm80211/include/proto/bcmip.h b/drivers/staging/brcm80211/include/proto/bcmip.h
index d9d6e8e..738f7cd 100644
--- a/drivers/staging/brcm80211/include/proto/bcmip.h
+++ b/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/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index 9ce8de8c..dca37a4 100644
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/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/drivers/staging/brcm80211/include/proto/vlan.h b/drivers/staging/brcm80211/include/proto/vlan.h
index 1dcd3f3..be72c3a 100644
--- a/drivers/staging/brcm80211/include/proto/vlan.h
+++ b/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
OpenPOWER on IntegriCloud