Commit 109528b2 authored Jul 12, 2014 by Olof Johansson

Merge tag 'renesas-defconfig2-for-v3.17' of...

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

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

* Enable genmai board in multiplatform defconfig

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

:
  ARM: shmobile: Enable genmai board in multiplatform defconfig

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

parents 73290cc9 c6101005

arch/arm/configs/shmobile_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,9 +10,11 @@ CONFIG_PERF_EVENTS=y
		CONFIG_SLAB=y
		CONFIG_ARCH_SHMOBILE_MULTI=y
		CONFIG_ARCH_EMEV2=y
		CONFIG_ARCH_R7S72100=y
		CONFIG_ARCH_R8A7779=y
		CONFIG_ARCH_R8A7790=y
		CONFIG_ARCH_R8A7791=y
		CONFIG_MACH_GENMAI=y
		CONFIG_MACH_KOELSCH=y
		CONFIG_MACH_LAGER=y
		CONFIG_MACH_MARZEN=y