diff options
| author | Linus Torvalds | 2014-08-26 00:29:33 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-08-26 00:29:33 +0200 |
| commit | dd5957b78f9f17c3d4018dcff21dbae9a4486128 (patch) | |
| tree | c833cca7707288005906a7583c36112f7475637e /arch/sh | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | sh: intc: Confine SH_INTC to platforms that need it (diff) | |
| download | kernel-qcow2-linux-dd5957b78f9f17c3d4018dcff21dbae9a4486128.tar.gz kernel-qcow2-linux-dd5957b78f9f17c3d4018dcff21dbae9a4486128.tar.xz kernel-qcow2-linux-dd5957b78f9f17c3d4018dcff21dbae9a4486128.zip | |
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 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 453fa5c09550..b319846ad97f 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -172,6 +172,7 @@ menu "System type" # config CPU_SH2 bool + select SH_INTC config CPU_SH2A bool @@ -182,6 +183,7 @@ config CPU_SH3 bool select CPU_HAS_INTEVT select CPU_HAS_SR_RB + select SH_INTC select SYS_SUPPORTS_SH_TMU config CPU_SH4 @@ -189,6 +191,7 @@ config CPU_SH4 select CPU_HAS_INTEVT select CPU_HAS_SR_RB select CPU_HAS_FPU if !CPU_SH4AL_DSP + select SH_INTC select SYS_SUPPORTS_SH_TMU select SYS_SUPPORTS_HUGETLBFS if MMU |