diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:15 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:15 -0400 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/plat-samsung/Kconfig | |
| parent | 32457942b90aabb9242b450f02d18d9c8d982916 (diff) | |
| parent | 7d1a2077a7e519fc0c68617526abea3f72632e60 (diff) | |
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 | |||
| 203 | help | 203 | help |
| 204 | Internal configuration for S3C DMA core | 204 | Internal configuration for S3C DMA core |
| 205 | 205 | ||
| 206 | config S3C_PL330_DMA | ||
| 207 | bool | ||
| 208 | select PL330 | ||
| 209 | help | ||
| 210 | S3C DMA API Driver for PL330 DMAC. | ||
| 211 | |||
| 206 | comment "Power management" | 212 | comment "Power management" |
| 207 | 213 | ||
| 208 | config SAMSUNG_PM_DEBUG | 214 | config SAMSUNG_PM_DEBUG |