diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-17 19:06:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-17 19:06:12 -0500 |
| commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
| tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/sh/Kconfig | |
| parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 80119b3398e7..5c9cbfc14c4d 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -55,6 +55,8 @@ config GENERIC_HARDIRQS | |||
| 55 | 55 | ||
| 56 | config GENERIC_HARDIRQS_NO__DO_IRQ | 56 | config GENERIC_HARDIRQS_NO__DO_IRQ |
| 57 | def_bool y | 57 | def_bool y |
| 58 | depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \ | ||
| 59 | !SH_7751_SYSTEMH && !HD64461) | ||
| 58 | 60 | ||
| 59 | config GENERIC_IRQ_PROBE | 61 | config GENERIC_IRQ_PROBE |
| 60 | def_bool y | 62 | def_bool y |