diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /include/linux/string.h | |
parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) |
Merge with Linux 2.3.40.
Diffstat (limited to 'include/linux/string.h')
-rw-r--r-- | include/linux/string.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 6c9147718..e5002746b 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -2,10 +2,7 @@ #define _LINUX_STRING_H_ #include <linux/types.h> /* for size_t */ - -#ifndef NULL -#define NULL ((void *) 0) -#endif +#include <linux/stddef.h> /* for NULL */ #ifdef __cplusplus extern "C" { |