From 62872989bdbf1245d7239b9f4c05a8ee7c775ed5 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 17 Jun 2014 16:48:01 +0900 Subject: ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Change location of rcar-gen2.h so it can be used as #include "rcar-gen2.h" instead of the old style #include . Also clean up the r8a7790 case to follow the same style as r8a7791. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/include/mach/r8a7790.h | 2 -- arch/arm/mach-shmobile/include/mach/rcar-gen2.h | 8 -------- 2 files changed, 10 deletions(-) delete mode 100644 arch/arm/mach-shmobile/include/mach/rcar-gen2.h (limited to 'arch/arm/mach-shmobile/include/mach') diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/include/mach/r8a7790.h index 0b95babe84ba..d7555440fc7b 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7790.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h @@ -1,8 +1,6 @@ #ifndef __ASM_R8A7790_H__ #define __ASM_R8A7790_H__ -#include - /* DMA slave IDs */ enum { RCAR_DMA_SLAVE_INVALID, diff --git a/arch/arm/mach-shmobile/include/mach/rcar-gen2.h b/arch/arm/mach-shmobile/include/mach/rcar-gen2.h deleted file mode 100644 index 43f606eb2d82..000000000000 --- a/arch/arm/mach-shmobile/include/mach/rcar-gen2.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __ASM_RCAR_GEN2_H__ -#define __ASM_RCAR_GEN2_H__ - -void rcar_gen2_timer_init(void); -#define MD(nr) BIT(nr) -u32 rcar_gen2_read_mode_pins(void); - -#endif /* __ASM_RCAR_GEN2_H__ */ -- cgit v1.2.3