From 3deb65f148a77bc2ed56895cfeb63304982ac77d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 5 Oct 2010 09:48:23 -0700 Subject: [PATCH] --- yaml --- r: 220057 b: refs/heads/master c: a21142b22b8a09d4d683510113c1adf3b3eeced7 h: refs/heads/master i: 220055: 9cdcf2e8bbf37713deb1f56a549d8aa2d97fec00 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/include/typedefs.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b8a375659665..6d38d7c37b71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fbfd3e6d1eccb46cfddcabe4ea0c4860badc424 +refs/heads/master: a21142b22b8a09d4d683510113c1adf3b3eeced7 diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h index 92742d3e1fc1..ebf4529ece90 100644 --- a/trunk/drivers/staging/brcm80211/include/typedefs.h +++ b/trunk/drivers/staging/brcm80211/include/typedefs.h @@ -32,7 +32,6 @@ typedef unsigned long long int uintptr; #define TYPEDEF_USHORT #define TYPEDEF_ULONG #include -#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