diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-12-09 21:33:06 -0500 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-12-09 21:33:24 -0500 |
| commit | b6f6383b98092a1759d19893875bba90c8d9f446 (patch) | |
| tree | 98e31997769ed78c2c5b6cd7e9f2d4b2fa5d432e /arch/arm/configs | |
| parent | ccde0fbd4fe88151c8d3a93a3e3a939a0a1753b2 (diff) | |
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 <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
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 | |||
| 147 | CONFIG_RTC_DRV_S35390A=y | 147 | CONFIG_RTC_DRV_S35390A=y |
| 148 | CONFIG_DMADEVICES=y | 148 | CONFIG_DMADEVICES=y |
| 149 | CONFIG_SH_DMAE=y | 149 | CONFIG_SH_DMAE=y |
| 150 | CONFIG_RCAR_AUDMAC_PP=y | ||
| 151 | CONFIG_RCAR_DMAC=y | 150 | CONFIG_RCAR_DMAC=y |
| 152 | # CONFIG_IOMMU_SUPPORT is not set | 151 | # CONFIG_IOMMU_SUPPORT is not set |
| 153 | CONFIG_PWM=y | 152 | CONFIG_PWM=y |