diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 12:47:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 12:47:58 -0500 |
| commit | 3bd82263a0d770d2ab3efd37144993f4433a179c (patch) | |
| tree | 0082aa8c22eb0b6ba97368b5eb42edcb241ab0f3 /arch | |
| parent | eef70b217a7ab46e8e0cf75982ad75d8305d5591 (diff) | |
| parent | f9d62c009637f9581cdd7f6e430f8eec511c8587 (diff) | |
Merge branch 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Disable GENERIC_HARDIRQS_NO__DO_IRQ for unconverted platforms.
sh: maple: Do not pass SLAB_POISON to kmem_cache_create()
Diffstat (limited to 'arch')
| -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 |