From 6f28f5a9d6199b980ab357e729714a3c202660b8 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 22 Sep 2006 08:00:42 +0100
Subject: [PATCH] --- yaml --- r: 35473 b: refs/heads/master c:
 1694176a210189312e31b083bac1e1688981219a h: refs/heads/master i:   35471:
 1b3ba4a3e1c09bbb214432831337739b0c718eba v: v3

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

diff --git a/[refs] b/[refs]
index 6af8e03a0746..5134d1caa988 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed9526b0d342a1c08a19f880c3f0c1d0fec4e8db
+refs/heads/master: 1694176a210189312e31b083bac1e1688981219a
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 7d076d97b2f7..10d2ca07562a 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -143,7 +143,6 @@ header-y += snmp.h
 header-y += sockios.h
 header-y += som.h
 header-y += sound.h
-header-y += stddef.h
 header-y += synclink.h
 header-y += telephony.h
 header-y += termios.h
@@ -318,6 +317,7 @@ unifdef-y += sonet.h
 unifdef-y += sonypi.h
 unifdef-y += soundcard.h
 unifdef-y += stat.h
+unifdef-y += stddef.h
 unifdef-y += sysctl.h
 unifdef-y += tcp.h
 unifdef-y += time.h
diff --git a/trunk/include/linux/stddef.h b/trunk/include/linux/stddef.h
index b3a2cadf90f2..ea65dfb60cd8 100644
--- a/trunk/include/linux/stddef.h
+++ b/trunk/include/linux/stddef.h
@@ -10,11 +10,13 @@
 #define NULL ((void *)0)
 #endif
 
+#ifdef __KERNEL__
 #undef offsetof
 #ifdef __compiler_offsetof
 #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
 #else
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
+#endif /* __KERNEL__ */
 
 #endif