diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/ia64/include/asm/fpu.h | |
| parent | bf33a70a73876b163d62612e9567cbac6604ba7e (diff) | |
| parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 (diff) | |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/ia64/include/asm/fpu.h')
| -rw-r--r-- | arch/ia64/include/asm/fpu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/asm/fpu.h index 3859558ff0a4..0c26157cffa5 100644 --- a/arch/ia64/include/asm/fpu.h +++ b/arch/ia64/include/asm/fpu.h | |||
| @@ -6,8 +6,6 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <asm/types.h> | ||
| 10 | |||
| 11 | /* floating point status register: */ | 9 | /* floating point status register: */ |
| 12 | #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */ | 10 | #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */ |
| 13 | #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */ | 11 | #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */ |