Commit 5f1b2953 authored Dec 16, 2014 by Arnd Bergmann

Merge tag 'renesas-defconfig-fixes-for-v3.19' of...

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

Pull "Renesas ARM Based SoC Defconfig Fixes for v3.19" from Simon Horman:

* Revert change enabling RCAR_AUDMAC_PP in shmobile_defconfig

  Unfortunately enabling RCAR_AUDMAC_PP support this patch breaks dmaengine
  support on R-Car Gen2 boards. This should be resolved by driver updates
  in v3.20. But v3.19 was too early for this defconfig change.

* tag 'renesas-defconfig-fixes-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig"

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 20911ce6 b6f6383b

arch/arm/configs/shmobile_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_S35390A=y
		CONFIG_DMADEVICES=y
		CONFIG_SH_DMAE=y
		CONFIG_RCAR_AUDMAC_PP=y
		CONFIG_RCAR_DMAC=y
		# CONFIG_IOMMU_SUPPORT is not set
		CONFIG_PWM=y