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-s3c/Makefile | |
| 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/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 | |||
| 18 | obj-y += gpio.o | 18 | obj-y += gpio.o |
| 19 | obj-y += gpio-config.o | 19 | obj-y += gpio-config.o |
| 20 | 20 | ||
| 21 | # DMA support | ||
| 22 | |||
| 23 | obj-$(CONFIG_S3C_DMA) += dma.o | ||
| 24 | |||
| 21 | # PM support | 25 | # PM support |
| 22 | 26 | ||
| 23 | obj-$(CONFIG_PM) += pm.o | 27 | obj-$(CONFIG_PM) += pm.o |