diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 14:45:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 14:45:48 -0400 |
| commit | 10027471a305c5491d23add394041120720e8a11 (patch) | |
| tree | 9e3c91a56ba45d4beb26f8ae84021b1897da460d /include/asm-sh/processor.h | |
| parent | 61434392f797cf89872bda87dff8b3395edf4108 (diff) | |
| parent | 26b63e995113dd48fde66c0d0d65eecc6df53172 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: Fix up uImage compression type
remove include/asm-sh/floppy.h
sh: Fix TIF_USEDFPU clearing under FPU emulation.
sh: Fix occasional FPU register corruption under preempt.
Diffstat (limited to 'include/asm-sh/processor.h')
| -rw-r--r-- | include/asm-sh/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h index 19fe47c1ca17..ec707b98e5b9 100644 --- a/include/asm-sh/processor.h +++ b/include/asm-sh/processor.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __ASM_SH_PROCESSOR_H | 2 | #define __ASM_SH_PROCESSOR_H |
| 3 | 3 | ||
| 4 | #include <asm/cpu-features.h> | 4 | #include <asm/cpu-features.h> |
| 5 | #include <asm/fpu.h> | ||
| 6 | 5 | ||
| 7 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
| 8 | /* | 7 | /* |