Commit ecc5d5d2 authored Sep 24, 2014 by Olof Johansson

Merge tag 'renesas-defconfig4-for-v3.18' of...

Merge tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18" from Simon Horman:

Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable r8a7794 SoC in shmobile_defconfig

* tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 2d9251e3 7d984c95

arch/arm/configs/shmobile_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ CONFIG_ARCH_R8A7740=y
		CONFIG_ARCH_R8A7779=y
		CONFIG_ARCH_R8A7790=y
		CONFIG_ARCH_R8A7791=y
		CONFIG_ARCH_R8A7794=y
		CONFIG_MACH_KOELSCH=y
		CONFIG_MACH_LAGER=y
		CONFIG_MACH_MARZEN=y