diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-17 09:16:46 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-17 09:16:46 -0500 |
| commit | 275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch) | |
| tree | df906ef901d7719d66944921c7436f5db718dc2f /arch/sh/Kconfig | |
| parent | 909ea96468096b07fbb41aaf69be060d92bd9271 (diff) | |
| parent | 8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff) | |
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 7f217b3a50a8..2e9d78d21fd3 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -22,7 +22,8 @@ config SUPERH | |||
| 22 | select HAVE_SPARSE_IRQ | 22 | select HAVE_SPARSE_IRQ |
| 23 | select RTC_LIB | 23 | select RTC_LIB |
| 24 | select GENERIC_ATOMIC64 | 24 | select GENERIC_ATOMIC64 |
| 25 | select GENERIC_HARDIRQS_NO_DEPRECATED | 25 | # Support the deprecated APIs until MFD and GPIOLIB catch up. |
| 26 | select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB | ||
| 26 | help | 27 | help |
| 27 | The SuperH is a RISC processor targeted for use in embedded systems | 28 | The SuperH is a RISC processor targeted for use in embedded systems |
| 28 | and consumer electronics; it was also used in the Sega Dreamcast | 29 | and consumer electronics; it was also used in the Sega Dreamcast |