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-s3c/Makefile | |
| 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-s3c/Makefile')
| -rw-r--r-- | arch/arm/plat-s3c/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 061e20458e89..610651455a78 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile @@ -18,6 +18,10 @@ obj-y += pwm-clock.o obj-y += gpio.o obj-y += gpio-config.o +# DMA support + +obj-$(CONFIG_S3C_DMA) += dma.o + # PM support obj-$(CONFIG_PM) += pm.o |