[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

diff --cc arch/arm/plat-s3c/Kconfig
Simple merge

diff --cc arch/arm/plat-s3c/Makefile
Simple merge

diff --cc arch/arm/plat-s3c64xx/Kconfig
Simple merge

diff --cc arch/arm/plat-s3c64xx/Makefile
index 030050f5c76d05d54b90a552a9b86b37288bc812,61bdb67e2f6da3bddb1022c0ec5f656b1712a078..2ed5df34f9ea9abafc63afa3a709c16b21ca424b
--- 1/arch/arm/plat-s3c64xx/Makefile
--- 2/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