diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 10:46:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 10:46:30 -0500 |
| commit | f6c727813e03ce0f58d73808da8c9a6bc227249e (patch) | |
| tree | c92bd329e5720919e7fbcc91aa52d7f440796440 /include/linux/types.h | |
| parent | 0b86a4e34d885e734a4c4e46293376f3f1c639eb (diff) | |
| parent | 527bdfee18ac6a4c026060c2c2b1144df9a5bf1f (diff) | |
Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip into core/header-fixes
Diffstat (limited to 'include/linux/types.h')
| -rw-r--r-- | include/linux/types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 712ca53bc34..c30973ace89 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _LINUX_TYPES_H | 1 | #ifndef _LINUX_TYPES_H |
| 2 | #define _LINUX_TYPES_H | 2 | #define _LINUX_TYPES_H |
| 3 | 3 | ||
| 4 | #ifndef __ASSEMBLY__ | ||
| 4 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 5 | 6 | ||
| 6 | #define DECLARE_BITMAP(name,bits) \ | 7 | #define DECLARE_BITMAP(name,bits) \ |
| @@ -212,5 +213,5 @@ struct ustat { | |||
| 212 | }; | 213 | }; |
| 213 | 214 | ||
| 214 | #endif /* __KERNEL__ */ | 215 | #endif /* __KERNEL__ */ |
| 215 | 216 | #endif /* __ASSEMBLY__ */ | |
| 216 | #endif /* _LINUX_TYPES_H */ | 217 | #endif /* _LINUX_TYPES_H */ |