diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 16:32:29 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 16:32:29 +0100 |
commit | bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (patch) | |
tree | 6a4345fe0f908d60f52085b97818be705c62af8e /arch/arm/plat-s3c/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-s3c/Kconfig')
-rw-r--r-- | arch/arm/plat-s3c/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig index 140391587c3..935c7558469 100644 --- a/arch/arm/plat-s3c/Kconfig +++ b/arch/arm/plat-s3c/Kconfig @@ -159,6 +159,13 @@ config S3C_GPIO_CFG_S3C64XX Internal configuration to enable S3C64XX style GPIO configuration functions. +# DMA + +config S3C_DMA + bool + help + Internal configuration for S3C DMA core + # device definitions to compile in config S3C_DEV_HSMMC |