Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
Conflicts: drivers/sh/intc/dynamic.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
@@ -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"
|
||||
|
Reference in New Issue
Block a user