From 5f93a7fe45fcdc3500edd6e899732630a6d5838f Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak@suse.cz>
Date: Wed, 21 Mar 2012 14:08:24 +0100
Subject: [PATCH] --- yaml --- r: 299230 b: refs/heads/master c:
 2084c24a81413b75bc97e4bee56b32ffece70460 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/stddef.h | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index aec9f942dc3b..93f9fec4123f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668ce0ac707719d866af7e432e518af7b4c575ad
+refs/heads/master: 2084c24a81413b75bc97e4bee56b32ffece70460
diff --git a/trunk/include/linux/stddef.h b/trunk/include/linux/stddef.h
index 6a40c76bdcf1..1747b6787b9e 100644
--- a/trunk/include/linux/stddef.h
+++ b/trunk/include/linux/stddef.h
@@ -3,14 +3,10 @@
 
 #include <linux/compiler.h>
 
+#ifdef __KERNEL__
+
 #undef NULL
-#if defined(__cplusplus)
-#define NULL 0
-#else
 #define NULL ((void *)0)
-#endif
-
-#ifdef __KERNEL__
 
 enum {
 	false	= 0,