Patched in Tegra support.

1 files changed, 9 insertions, 2 deletions

diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index f4aec0e75c3..6a40c76bdcf 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -1,11 +1,16 @@
 #ifndef _LINUX_STDDEF_H
 #define _LINUX_STDDEF_H
 
-#include <uapi/linux/stddef.h>
-
+#include <linux/compiler.h>
 
 #undef NULL
+#if defined(__cplusplus)
+#define NULL 0
+#else
 #define NULL ((void *)0)
+#endif
+
+#ifdef __KERNEL__
 
 enum {
         false   = 0,
@@ -18,4 +23,6 @@ enum {
 #else
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
+#endif /* __KERNEL__ */
+
 #endif