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 /arch/sh/Kconfig | |
| 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 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 12720489e458..8d2cd1de5726 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -72,9 +72,6 @@ config SYS_SUPPORTS_NUMA | |||
| 72 | config SYS_SUPPORTS_PCI | 72 | config SYS_SUPPORTS_PCI |
| 73 | bool | 73 | bool |
| 74 | 74 | ||
| 75 | config ARCH_MAY_HAVE_PC_FDC | ||
| 76 | bool | ||
| 77 | |||
| 78 | config STACKTRACE_SUPPORT | 75 | config STACKTRACE_SUPPORT |
| 79 | def_bool y | 76 | def_bool y |
| 80 | 77 | ||