From: Simon Horman Date: Wed, 10 Dec 2014 02:33:06 +0000 (+0900) Subject: Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig" X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9062^2^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b6f6383b98092a1759d19893875bba90c8d9f446;p=mirror_ubuntu-artful-kernel.git Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig" This reverts commit 2315f9fce4da7df9362e4baeb5250d14ea48bf63. 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. Signed-off-by: Simon Horman --- diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index cc67508a439a..302faab4b70f 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -147,7 +147,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