diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 17:32:29 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 17:32:29 +0200 |
| commit | bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (patch) | |
| tree | 6a4345fe0f908d60f52085b97818be705c62af8e /arch/arm/plat-s3c24xx/Kconfig | |
| parent | [ARM] S3C64XX: Use common watchdog reset for system reset. (diff) | |
| parent | [ARM] S3C64XX: Lower severity of DMA logging (diff) | |
| download | linux-bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0.tar.xz linux-bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0.zip | |
[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-s3c24xx/Kconfig')
| -rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 2c8a2f5d75ff..5b0bc914f58e 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig @@ -71,6 +71,7 @@ config PM_SIMTEC config S3C2410_DMA bool "S3C2410 DMA support" depends on ARCH_S3C2410 + select S3C_DMA help S3C2410 DMA support. This is needed for drivers like sound which use the S3C2410's DMA system to move data to and from the |