From: Ben Dooks Date: Mon, 18 May 2009 15:32:29 +0000 (+0100) Subject: [ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel X-Git-Tag: v2.6.31-rc1~344^2~10^2~1 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0;p=pandora-kernel.git [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 --- bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 diff --cc arch/arm/plat-s3c64xx/Makefile index 030050f5c76d,61bdb67e2f6d..2ed5df34f9ea --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile @@@ -24,12 -24,10 +24,16 @@@ obj-y += gpiolib. obj-$(CONFIG_CPU_S3C6400_INIT) += s3c6400-init.o obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o +# PM support + +obj-$(CONFIG_PM) += pm.o +obj-$(CONFIG_PM) += sleep.o +obj-$(CONFIG_PM) += irq-pm.o + + # DMA support + + obj-$(CONFIG_S3C64XX_DMA) += dma.o + # Device setup obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o