diff options
author | Nishanth Menon <nm@ti.com> | 2010-07-12 18:56:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 13:50:15 -0400 |
commit | 86dd51e4c4d620dfe1aca584a1332b55f3a49c05 (patch) | |
tree | 51a7559e277d8a784dcf00b6d1a66a176eeab5c2 /drivers/staging/tidspbridge/include | |
parent | 5e7680679e4ac852db7b03e232f3472f86d4c47f (diff) |
staging: tidspbridge: no need for custom NULL
kernel has it's own NULL define, we dont need to introduce our own
custom NULL type!
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/include')
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/dbtype.h | 8 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/std.h | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h index 0b2cb93c050..ca5eaf8a298 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h | |||
@@ -42,14 +42,6 @@ | |||
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | /*===========================================================================*/ | 44 | /*===========================================================================*/ |
45 | /* NULL (Definition is language specific) */ | ||
46 | /*===========================================================================*/ | ||
47 | |||
48 | #ifndef NULL | ||
49 | #define NULL ((void *)0) /* Null pointer. */ | ||
50 | #endif | ||
51 | |||
52 | /*===========================================================================*/ | ||
53 | /* NULL character (normally used for string termination) */ | 45 | /* NULL character (normally used for string termination) */ |
54 | /*===========================================================================*/ | 46 | /*===========================================================================*/ |
55 | 47 | ||
diff --git a/drivers/staging/tidspbridge/include/dspbridge/std.h b/drivers/staging/tidspbridge/include/dspbridge/std.h index 7e09fec18ee..ca2827d92e2 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/std.h +++ b/drivers/staging/tidspbridge/include/dspbridge/std.h | |||
@@ -74,10 +74,6 @@ | |||
74 | 74 | ||
75 | typedef s32(*fxn) (void); /* generic function type */ | 75 | typedef s32(*fxn) (void); /* generic function type */ |
76 | 76 | ||
77 | #ifndef NULL | ||
78 | #define NULL 0 | ||
79 | #endif | ||
80 | |||
81 | /* | 77 | /* |
82 | * These macros are used to cast 'Arg' types to 's32' or 'Ptr'. | 78 | * These macros are used to cast 'Arg' types to 's32' or 'Ptr'. |
83 | * These macros were added for the 55x since Arg is not the same | 79 | * These macros were added for the 55x since Arg is not the same |