---

yaml --- r: 205870 b: refs/heads/master c: 86dd51e h: refs/heads/master v: v3
git-mirror · Jul 22, 2010 · 4660a8e · 4660a8e
1 parent 3c21ee2
commit 4660a8e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7680679e4ac852db7b03e232f3472f86d4c47f
+refs/heads/master: 86dd51e4c4d620dfe1aca584a1332b55f3a49c05
diff --git a/trunk/drivers/staging/tidspbridge/dynload/header.h b/trunk/drivers/staging/tidspbridge/dynload/header.h
@@ -14,10 +14,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 #include <linux/string.h>
 #define DL_STRCMP  strcmp
 

diff --git a/trunk/drivers/staging/tidspbridge/hw/GlobalTypes.h b/trunk/drivers/staging/tidspbridge/hw/GlobalTypes.h
@@ -19,15 +19,6 @@
 #ifndef _GLOBALTYPES_H
 #define _GLOBALTYPES_H
 
-/*
- * Definition: NULL
- *
- * DESCRIPTION:  Invalid pointer
- */
-#ifndef NULL
-#define NULL	(void *)0
-#endif
-
 /*
  * Definition: RET_CODE_BASE
  *

diff --git a/trunk/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/trunk/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
@@ -41,14 +41,6 @@
 #define CONST   const
 #endif
 
-/*===========================================================================*/
-/*  NULL    (Definition is language specific) */
-/*===========================================================================*/
-
-#ifndef NULL
-#define NULL    ((void *)0)	/* Null pointer. */
-#endif
-
 /*===========================================================================*/
 /*  NULL character   (normally used for string termination) */
 /*===========================================================================*/

diff --git a/trunk/drivers/staging/tidspbridge/include/dspbridge/std.h b/trunk/drivers/staging/tidspbridge/include/dspbridge/std.h
@@ -74,10 +74,6 @@
 
 typedef s32(*fxn) (void);	/* generic function type */
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 /*
  * These macros are used to cast 'Arg' types to 's32' or 'Ptr'.
  * These macros were added for the 55x since Arg is not the same