From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 5 Oct 2010 16:48:23 +0000 (-0700)
Subject: Staging: brcm80211: remove bool redefinition
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a21142b22b8a09d4d683510113c1adf3b3eeced7;p=linux-beck.git

Staging: brcm80211: remove bool redefinition

The core kernel type code handles this properly, no driver
should ever do it.

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>
---

diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h
index 92742d3e1fc1..ebf4529ece90 100644
--- a/drivers/staging/brcm80211/include/typedefs.h
+++ b/drivers/staging/brcm80211/include/typedefs.h
@@ -32,7 +32,6 @@ typedef unsigned long long int uintptr;
 #define TYPEDEF_USHORT
 #define TYPEDEF_ULONG
 #include <linux/version.h>
-#define TYPEDEF_BOOL
 
 /* Do not support the (u)int64 types with strict ansi for GNU C */
 #if defined(__GNUC__) && defined(__STRICT_ANSI__)
@@ -45,9 +44,6 @@ typedef unsigned long long int uintptr;
 /*
  * Default Typedefs
  */
-#ifndef TYPEDEF_BOOL
-typedef /* @abstract@ */ unsigned char bool;
-#endif
 
 /* define uchar, ushort, uint, ulong */
 
@@ -130,7 +126,6 @@ typedef signed long long int64;
 
 #define	AUTO	(-1)		/* Auto = -1 */
 
-#undef TYPEDEF_BOOL
 #undef TYPEDEF_UCHAR
 #undef TYPEDEF_USHORT
 #undef TYPEDEF_UINT