diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 16:46:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 16:46:30 +0100 |
| commit | f6c727813e03ce0f58d73808da8c9a6bc227249e (patch) | |
| tree | c92bd329e5720919e7fbcc91aa52d7f440796440 | |
| parent | 0b86a4e34d885e734a4c4e46293376f3f1c639eb (diff) | |
| parent | 527bdfee18ac6a4c026060c2c2b1144df9a5bf1f (diff) | |
| download | blackbird-op-linux-f6c727813e03ce0f58d73808da8c9a6bc227249e.tar.gz blackbird-op-linux-f6c727813e03ce0f58d73808da8c9a6bc227249e.zip | |
Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip into core/header-fixes
| -rw-r--r-- | arch/ia64/include/asm/fpu.h | 2 | ||||
| -rw-r--r-- | include/linux/types.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h index b6395ad1500a..0c26157cffa5 100644 --- a/arch/ia64/include/asm/fpu.h +++ b/arch/ia64/include/asm/fpu.h @@ -6,8 +6,6 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ -#include <linux/types.h> - /* floating point status register: */ #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */ #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */ diff --git a/include/linux/types.h b/include/linux/types.h index 712ca53bc348..c30973ace890 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -1,6 +1,7 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H +#ifndef __ASSEMBLY__ #ifdef __KERNEL__ #define DECLARE_BITMAP(name,bits) \ @@ -212,5 +213,5 @@ struct ustat { }; #endif /* __KERNEL__ */ - +#endif /* __ASSEMBLY__ */ #endif /* _LINUX_TYPES_H */ |
