From ec7684df93db5fd1bd96bab5b69e5b7e28562bd6 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 5 Oct 2010 09:50:20 -0700
Subject: [PATCH] --- yaml --- r: 220058 b: refs/heads/master c:
 5393ddf14e7071ceeefde74a95bbc6ac9203c579 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/brcm80211/include/typedefs.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6d38d7c37b71..0b05fe8ebe29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a21142b22b8a09d4d683510113c1adf3b3eeced7
+refs/heads/master: 5393ddf14e7071ceeefde74a95bbc6ac9203c579
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index ebf4529ece90..41b1b5c28921 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -32,13 +32,6 @@ typedef unsigned long long int uintptr;
 #define TYPEDEF_USHORT
 #define TYPEDEF_ULONG
 #include <linux/version.h>
-
-/* Do not support the (u)int64 types with strict ansi for GNU C */
-#if defined(__GNUC__) && defined(__STRICT_ANSI__)
-#define TYPEDEF_INT64
-#define TYPEDEF_UINT64
-#endif
-
 #include <linux/types.h>
 
 /*