diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-25 18:29:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-25 18:29:33 -0400 |
commit | dd5957b78f9f17c3d4018dcff21dbae9a4486128 (patch) | |
tree | c833cca7707288005906a7583c36112f7475637e /drivers/sh/intc | |
parent | 497c01dda9a6abc969573ba999a86ed04a835e76 (diff) | |
parent | 049d28048be595e0a10a58fe1c104b153c386633 (diff) |
Merge tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SH driver fix from Simon Horman:
"Confine SH_INTC to platforms that need it"
* tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
sh: intc: Confine SH_INTC to platforms that need it
Diffstat (limited to 'drivers/sh/intc')
-rw-r--r-- | drivers/sh/intc/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/sh/intc/Kconfig b/drivers/sh/intc/Kconfig index 60228fae943f..6a1b05ddc8c9 100644 --- a/drivers/sh/intc/Kconfig +++ b/drivers/sh/intc/Kconfig | |||
@@ -1,7 +1,9 @@ | |||
1 | config SH_INTC | 1 | config SH_INTC |
2 | def_bool y | 2 | bool |
3 | select IRQ_DOMAIN | 3 | select IRQ_DOMAIN |
4 | 4 | ||
5 | if SH_INTC | ||
6 | |||
5 | comment "Interrupt controller options" | 7 | comment "Interrupt controller options" |
6 | 8 | ||
7 | config INTC_USERIMASK | 9 | config INTC_USERIMASK |
@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG | |||
37 | between system IRQs and the per-controller id tables. | 39 | between system IRQs and the per-controller id tables. |
38 | 40 | ||
39 | If in doubt, say N. | 41 | If in doubt, say N. |
42 | |||
43 | endif | ||