Renesas ARM Based SoC Defconfig Fixes for v3.19

* 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUiQIbAAoJENfPZGlqN0++RdAQAKERkE9l66Ej/ymb0jOP3x6q
 zIyXIjRo9dXQpKtxY03y0eKisA+h+DDYEoY77rniB/QmwUImoRaXrg7vc40cn/bz
 pgkv3Vm36GAtQGbE8sFQB/ui205+UFiArXPSQFlIRmoj7dfMCA4c3di1j1MowXWL
 UiI+HQuXxzi+DKO1aefAYntLhIwMCJ7FN4Y/LlqA08+1z4rQWOtJEm4Ft3Xx8Jly
 NAA63eRaEh64OfVgbAeJ5/qf95KHv2KQ58zX9nFCQH3uz1VfGzThTRP8iRLj+9Us
 F+GAYyrzM/cBU1qLwxyo+OEtsuHfU8eNEJIDjFIVqVFENxuRl6xvxfsSLWyygTIR
 RRaSJdkLoj4A3TqvcCF8GykD8GenVcwfSURh0twoZMNAwNCAlrQx6jwACuJwQz44
 PVD2aQtGsy0WsswHE6f7zB7WEOnASYW2vd8tPgafdwDGNI/Tbcfoes161yWFS/TO
 nuADvpGC31HHCltm3taVIaqOJCKENT9mJ/gSyxBKS7Tm0hS5GWxRWdEYS5dTlVVB
 27arJGk0RN2q3bfyifUwhyMCYRPgVcrBLEDU+KW0HqyGXsRA5Q5iPCJqCeSp8nov
 OyXj32XaOPAz3HCRVLHrnJ5C9I8uNRB9wtO0jGWn9JQKdeIGoj9A5gpi3VDhofRq
 P/QlUTFQMfZvhmh0DYRB
 =x8xe
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2014-12-16 21:43:15 +01:00
Родитель 20911ce607 b6f6383b98
Коммит 5f1b2953da
1 изменённых файлов: 0 добавлений и 1 удалений

Просмотреть файл

@ -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