diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 11:32:29 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 11:32:29 -0400 |
| commit | bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (patch) | |
| tree | 6a4345fe0f908d60f52085b97818be705c62af8e /arch/arm/plat-s3c64xx/Kconfig | |
| parent | 543899f610799426babb5313682fd9c249e34677 (diff) | |
| parent | 0b13406a1f1928ec71e81dde52cb62d72ffd28ef (diff) | |
[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel
Merge branch 'next-s3c64xx-dma2' into for-rmk-devel
Conflicts:
arch/arm/plat-s3c64xx/Makefile
Diffstat (limited to 'arch/arm/plat-s3c64xx/Kconfig')
| -rw-r--r-- | arch/arm/plat-s3c64xx/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig index eb088db0e650..5ebd8b425a54 100644 --- a/arch/arm/plat-s3c64xx/Kconfig +++ b/arch/arm/plat-s3c64xx/Kconfig | |||
| @@ -39,6 +39,10 @@ config CPU_S3C6400_CLOCK | |||
| 39 | Common clock support code for the S3C6400 that is shared | 39 | Common clock support code for the S3C6400 that is shared |
| 40 | by other CPUs in the series, such as the S3C6410. | 40 | by other CPUs in the series, such as the S3C6410. |
| 41 | 41 | ||
| 42 | config S3C64XX_DMA | ||
| 43 | bool "S3C64XX DMA" | ||
| 44 | select S3C_DMA | ||
| 45 | |||
| 42 | # platform specific device setup | 46 | # platform specific device setup |
| 43 | 47 | ||
| 44 | config S3C64XX_SETUP_I2C0 | 48 | config S3C64XX_SETUP_I2C0 |