From 09d166a48d0d79b3ecc745d149f86b0fb50dd5a2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 5 Oct 2010 09:58:02 -0700
Subject: [PATCH] --- yaml --- r: 220062 b: refs/heads/master c:
 42e5386d1c363be058ea4186351bef721539b592 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index decf1c77e19d..0c9bf227460b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 151da5a562b9ddbe57dcbd24cb3d855faf843516
+refs/heads/master: 42e5386d1c363be058ea4186351bef721539b592
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 10cb839083c7..6e43f8872779 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -96,10 +96,6 @@ typedef signed int int32;
 #define TRUE	1		/* TRUE */
 #endif
 
-#ifndef NULL
-#define	NULL	0
-#endif
-
 #ifndef OFF
 #define	OFF	0
 #endif