diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-06 17:01:57 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-06 17:05:57 -0700 |
| commit | 64460c7ef222e9cf62259a892c14428359795d9c (patch) | |
| tree | 25fdd6d42f21df586685275d2181c9465d7894d2 /arch/arm/mach-shmobile/board-lager-reference.c | |
| parent | 402277e0f8d33ff22fcaaa9b71d49f2e9929364b (diff) | |
| parent | 62872989bdbf1245d7239b9f4c05a8ee7c775ed5 (diff) | |
Merge tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Header Cleanup for v3.17" from Simon Horman:
Move the most common shared header files for mach-shmobile
from <mach/foobar.h> to "foobar.h"
* tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
ARM: shmobile: Move common.h
ARM: shmobile: Move most of irqs.h, keep some for pinctl
ARM: shmobile: Move clock.h
ARM: shmobile: Move dma-register.h
ARM: shmobile: Move intc.h, cleanup sh_intc.h usage
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager-reference.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c index 749832e3f33c..4f0af91ebc81 100644 --- a/arch/arm/mach-shmobile/board-lager-reference.c +++ b/arch/arm/mach-shmobile/board-lager-reference.c @@ -22,12 +22,12 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <linux/platform_data/rcar-du.h> -#include <mach/clock.h> -#include <mach/common.h> -#include <mach/irqs.h> -#include <mach/rcar-gen2.h> #include <mach/r8a7790.h> #include <asm/mach/arch.h> +#include "clock.h" +#include "common.h" +#include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data lager_du_encoders[] = { |