diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:04:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:04:05 -0700 |
| commit | 4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e (patch) | |
| tree | fb09c210f8402cb7201b6ae4797343adcf4b73ac /arch/sh/Kconfig | |
| parent | b4a41ed24c858d75985c7dcba685715fdf2e6114 (diff) | |
| parent | b15ed691667f59867c9c130b8d84feda4050be04 (diff) | |
| download | talos-obmc-linux-4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e.tar.gz talos-obmc-linux-4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e.zip | |
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix build alloc_thread_info_node function
sh: Fix ptrace hw_breakpoint handling
sh: Fix ptrace fpu state initialisation
sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED.
sh: pmb: Use struct syscore_ops instead of sysdevs
sh: Use struct syscore_ops instead of sysdevs
sh: Conver to asm-generic/sizes.h.
sh: wire up sys_syncfs.
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 1fbf0c7583d0..9af3c8d0776b 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -23,8 +23,7 @@ config SUPERH select HAVE_SPARSE_IRQ select RTC_LIB select GENERIC_ATOMIC64 - # Support the deprecated APIs until MFD and GPIOLIB catch up. - select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB + select GENERIC_HARDIRQS_NO_DEPRECATED select GENERIC_IRQ_SHOW help The SuperH is a RISC processor targeted for use in embedded systems |
