Commit ff8a19c2 authored Jul 12, 2014 by Olof Johansson

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

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

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

- Enable R-Car Gen 2 PCIe in shmobile_defconfig

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

:
  ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig

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

parents 109528b2 8cbf869a

arch/arm/configs/shmobile_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ CONFIG_PL310_ERRATA_588369=y
		CONFIG_ARM_ERRATA_754322=y
		CONFIG_PCI=y
		CONFIG_PCI_RCAR_GEN2=y
		CONFIG_PCI_RCAR_GEN2_PCIE=y
		CONFIG_SMP=y
		CONFIG_SCHED_MC=y
		CONFIG_HAVE_ARM_ARCH_TIMER=y