diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-06-17 11:48:01 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 12:09:40 +0400 |
| commit | 62872989bdbf1245d7239b9f4c05a8ee7c775ed5 (patch) | |
| tree | db60b4d8f260a72eb098c538c082e5c5425ec492 /arch/arm/mach-shmobile/include/mach | |
| parent | 585c09df3738d4f72cee36eb0b975351fd9a339a (diff) | |
| download | linux-62872989bdbf1245d7239b9f4c05a8ee7c775ed5.tar.xz | |
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 <mach/rcar-gen2.h>. Also clean up
the r8a7790 case to follow the same style as r8a7791.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7790.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/rcar-gen2.h | 8 |
2 files changed, 0 insertions, 10 deletions
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 <mach/rcar-gen2.h> - /* 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__ */ |