diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-08 09:08:30 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-08 09:08:30 +0400 |
| commit | bdd18e8f76e33151a850906c8353222bd06a49e6 (patch) | |
| tree | 2a2d0e77d8d4409bcc0e137c1ec8cc1e3be08a98 /arch/arm/mach-shmobile/intc-sh73a0.c | |
| parent | 4c834452aad01531db949414f94f817a86348d59 (diff) | |
| parent | 5f65c5bd58bf027eb2bacc2294a98e7aea81c630 (diff) | |
| download | linux-bdd18e8f76e33151a850906c8353222bd06a49e6.tar.xz | |
Merge tag 'renesas-boards-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Renesas ARM Based SoC Boards Updates for v3.17" from Simon Horman:
- armadillo800eva LED support
- Remove now unnecessary work arounds for c\lock issues
- Enable R-Car Gen2 CMA code
* tag 'renesas-boards-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable R-Car Gen2 CMA code in board files
ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
ARM: shmobile: armadillo800eva legacy: Add LED support
ARM: shmobile: lager-reference: Remove workarounds for core clock issues
ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/intc-sh73a0.c')
| -rw-r--r-- | arch/arm/mach-shmobile/intc-sh73a0.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c index 19a26f4579b3..1a8f9a7af983 100644 --- a/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/arch/arm/mach-shmobile/intc-sh73a0.c @@ -22,14 +22,13 @@ #include <linux/module.h> #include <linux/irq.h> #include <linux/io.h> -#include <linux/sh_intc.h> #include <linux/irqchip.h> #include <linux/irqchip/arm-gic.h> -#include <mach/intc.h> -#include <mach/irqs.h> #include <mach/sh73a0.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include "intc.h" +#include "irqs.h" enum { UNUSED = 0, |