diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/stddef.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/stddef.h')
| -rw-r--r-- | include/linux/stddef.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/stddef.h b/include/linux/stddef.h index 1747b6787b9e..f4aec0e75c3a 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | #ifndef _LINUX_STDDEF_H | 1 | #ifndef _LINUX_STDDEF_H |
| 2 | #define _LINUX_STDDEF_H | 2 | #define _LINUX_STDDEF_H |
| 3 | 3 | ||
| 4 | #include <linux/compiler.h> | 4 | #include <uapi/linux/stddef.h> |
| 5 | 5 | ||
| 6 | #ifdef __KERNEL__ | ||
| 7 | 6 | ||
| 8 | #undef NULL | 7 | #undef NULL |
| 9 | #define NULL ((void *)0) | 8 | #define NULL ((void *)0) |
| @@ -19,6 +18,4 @@ enum { | |||
| 19 | #else | 18 | #else |
| 20 | #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) | 19 | #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) |
| 21 | #endif | 20 | #endif |
| 22 | #endif /* __KERNEL__ */ | ||
| 23 | |||
| 24 | #endif | 21 | #endif |