diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-09 11:09:35 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-09 11:09:35 -0400 |
commit | 138310e18b70caed1b7acf02a2c97170dcb3c55d (patch) | |
tree | c33e62cd472775401877f2c2ca8c071f0ac31581 /arch/arm/mach-shmobile/Makefile | |
parent | eb492df9616156416e160bb59f7fd0437d6f5424 (diff) | |
parent | 5923abb205e05773e0bb16c7ca4c0b41dbeec40e (diff) |
Merge tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Third Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:
* Initial r8a7794 SoC support
* Support Cortex-A7 in shmobile_init_delay()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Initial r8a7794 SoC support
ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index b5164ae436d6..d7337a5f6232 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o | |||
15 | obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o | 15 | obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o |
16 | obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o | 16 | obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o |
17 | obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o | 17 | obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o |
18 | obj-$(CONFIG_ARCH_R8A7794) += setup-r8a7794.o | ||
18 | obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o | 19 | obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o |
19 | obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o | 20 | obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o |
20 | 21 | ||