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/mach-s5pv210/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/mach-s5pv210/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index af33a1a89b72..7601c28e240b 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
| @@ -12,6 +12,7 @@ if ARCH_S5PV210 | |||
| 12 | config CPU_S5PV210 | 12 | config CPU_S5PV210 |
| 13 | bool | 13 | bool |
| 14 | select PLAT_S5P | 14 | select PLAT_S5P |
| 15 | select S3C_PL330_DMA | ||
| 15 | help | 16 | help |
| 16 | Enable S5PV210 CPU support | 17 | Enable S5PV210 CPU support |
| 17 | 18 | ||