diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 17:29:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 17:29:29 +0200 |
| commit | 59255f4de51e325571d23c8f6f5046069630619f (patch) | |
| tree | 201668e7626b5b385caf0617e24eb0e488e0677b /arch/arm/mach-shmobile/board-kzm9g.c | |
| parent | Merge tag 'renesas-init-delay-for-v3.18' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h (diff) | |
| download | linux-59255f4de51e325571d23c8f6f5046069630619f.tar.xz linux-59255f4de51e325571d23c8f6f5046069630619f.zip | |
Merge tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Second Round Of Renesas ARM Based SoC Updates For v3.18" from Simon Horman:
* Move legacy INTC definitions from irqs.h to intc.h
* Remove duplicate CPUFreq bits on r8a73a0/ape6evm
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h
ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits
ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9g.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 36593cb20e57..77e36fa0b142 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -50,6 +50,7 @@ #include <video/sh_mobile_lcdc.h> #include "common.h" +#include "intc.h" #include "irqs.h" #include "sh73a0.h" |