diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 05:12:41 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 05:12:41 +0200 |
| commit | d978006a54ddf73cdeb3c59d1862a17f4445751c (patch) | |
| tree | 407e4e37402936ef2c06bee64d8575390c3339f6 /arch/sh/boards/Kconfig | |
| parent | Merge branch 'sh/multi-unwinders' into sh-latest (diff) | |
| parent | sh: intc: Allocate subgroup virq backing desc directly. (diff) | |
| download | linux-d978006a54ddf73cdeb3c59d1862a17f4445751c.tar.xz linux-d978006a54ddf73cdeb3c59d1862a17f4445751c.zip | |
Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
Conflicts:
drivers/sh/intc/dynamic.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/Kconfig')
| -rw-r--r-- | arch/sh/boards/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 1f56b35d3248..7048c03490d9 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -44,6 +44,8 @@ config SH_7721_SOLUTION_ENGINE config SH_7722_SOLUTION_ENGINE bool "SolutionEngine7722" select SOLUTION_ENGINE + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN depends on CPU_SUBTYPE_SH7722 help Select 7722 SolutionEngine if configuring for a Hitachi SH772 @@ -80,6 +82,8 @@ config SH_7780_SOLUTION_ENGINE config SH_7343_SOLUTION_ENGINE bool "SolutionEngine7343" select SOLUTION_ENGINE + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN depends on CPU_SUBTYPE_SH7343 help Select 7343 SolutionEngine if configuring for a Hitachi @@ -295,6 +299,7 @@ config SH_X3PROTO bool "SH-X3 Prototype board" depends on CPU_SUBTYPE_SHX3 select NO_IOPORT if !PCI + select IRQ_DOMAIN config SH_MAGIC_PANEL_R2 bool "Magic Panel R2" |