diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:05:15 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:05:15 +0200 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/plat-samsung/Kconfig | |
| parent | ARM: Merge for-2635/fb-updates1 (diff) | |
| parent | S5PV210: DMA: Add platform devices for PL330 DMACs (diff) | |
| download | linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.tar.xz linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.zip | |
ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
Conflicts:
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 7a36cf85e138..5349d2181bd2 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -203,6 +203,12 @@ config S3C_DMA help Internal configuration for S3C DMA core +config S3C_PL330_DMA + bool + select PL330 + help + S3C DMA API Driver for PL330 DMAC. + comment "Power management" config SAMSUNG_PM_DEBUG |