summaryrefslogtreecommitdiffstats
path: root/include/asm-sh/processor.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-01 11:45:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-01 11:45:48 -0700
commit10027471a305c5491d23add394041120720e8a11 (patch)
tree9e3c91a56ba45d4beb26f8ae84021b1897da460d /include/asm-sh/processor.h
parent61434392f797cf89872bda87dff8b3395edf4108 (diff)
parent26b63e995113dd48fde66c0d0d65eecc6df53172 (diff)
downloadlinux-10027471a305c5491d23add394041120720e8a11.tar.gz
linux-10027471a305c5491d23add394041120720e8a11.tar.bz2
linux-10027471a305c5491d23add394041120720e8a11.zip
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.h1
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 @@
#define __ASM_SH_PROCESSOR_H
#include <asm/cpu-features.h>
-#include <asm/fpu.h>
#ifndef __ASSEMBLY__
/*