diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-14 21:28:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-14 21:28:35 +0000 |
commit | 8e6714ac6081dc400828c01a8cc78bbd3b2b687a (patch) | |
tree | 8803fb274c1036e6734d3ace3e53c652c4c8ff4e /arch/arm/mach-s3c64xx/Kconfig | |
parent | 67c2fe2f5d6c5448874479d0181909536b495d78 (diff) | |
parent | 328089a47112a4fc06071e2003ecd75cc6d31029 (diff) | |
download | talos-obmc-linux-8e6714ac6081dc400828c01a8cc78bbd3b2b687a.tar.gz talos-obmc-linux-8e6714ac6081dc400828c01a8cc78bbd3b2b687a.zip |
Merge branch 'topic/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dma
Diffstat (limited to 'arch/arm/mach-s3c64xx/Kconfig')
-rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 2cb8dc55b50e..7094bccbae91 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -17,9 +17,10 @@ config CPU_S3C6410 help Enable S3C6410 CPU support -config S3C64XX_DMA - bool "S3C64XX DMA" - select S3C_DMA +config S3C64XX_PL080 + bool "S3C64XX DMA using generic PL08x driver" + select AMBA_PL08X + select SAMSUNG_DMADEV config S3C64XX_SETUP_SDHCI bool |