From d186c34b83d20e69de98f0dee29cb2f3ecf5b65b Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 8 Oct 2010 11:13:11 -0700
Subject: [PATCH] --- yaml --- r: 220239 b: refs/heads/master c:
 f1d0fe0abc2c7643dee6df5ed473d3f1b0e15a97 h: refs/heads/master i:   220237:
 e1781c38cc8cae2d10a2de72652d93eb9a41855e   220235:
 1e21e35a9df0dc68c0d7e8895d8a68969ca0ad1e   220231:
 46b8dc89b34fdbd35f35cb462895c262368911d1   220223:
 e2eacef66e6b1c075c9ad112401c1e62bc3b7f59 v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/include/typedefs.h      | 22 +------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 4d85bc226d22..8efc69e5b9bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e26416e2f7fc2781c084c4ea51227aef30336de
+refs/heads/master: f1d0fe0abc2c7643dee6df5ed473d3f1b0e15a97
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 0461f75c064a..7c237cecf771 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -19,34 +19,16 @@
 
 #include <linux/types.h>
 
-/*
- * Infer the compile environment based on preprocessor symbols and pragmas.
- * Override type definitions as needed, and include configuration-dependent
- * header files to define types.
- */
-
 #if defined(__x86_64__)
 #define TYPEDEF_UINTPTR
 typedef unsigned long long int uintptr;
 #endif
 
-#define TYPEDEF_UINT
-
-/*
- * Default Typedefs
- */
-
-/* define uint */
-
-#ifndef TYPEDEF_UINT
-typedef unsigned int uint;
-#endif
-
 #ifndef TYPEDEF_UINTPTR
 typedef unsigned int uintptr;
 #endif
 
-/* define macro values */
+#undef TYPEDEF_UINTPTR
 
 #ifndef FALSE
 #define FALSE	0
@@ -66,8 +48,6 @@ typedef unsigned int uintptr;
 
 #define	AUTO	(-1)		/* Auto = -1 */
 
-#undef TYPEDEF_UINT
-#undef TYPEDEF_UINTPTR
 
 /*
  * Including the bcmdefs.h here, to make sure everyone including typedefs.h