ARM: Merge for-2635/s5p-dma

Merge branch 'for-2635/s5p-dma' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s5pv210/Makefile

diff --combined arch/arm/mach-s5pv210/Makefile
index 0acbdb3,f7f1cdc..192deac
--- 1/arch/arm/mach-s5pv210/Makefile
--- 2/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@@ -12,7 -12,7 +12,7 @@@ obj-                          :
  
  # Core support for S5PV210 system
  
- obj-$(CONFIG_CPU_S5PV210)     += cpu.o init.o clock.o gpiolib.o
 -obj-$(CONFIG_CPU_S5PV210)     += cpu.o init.o clock.o dma.o
++obj-$(CONFIG_CPU_S5PV210)     += cpu.o init.o clock.o dma.o gpiolib.o
  
  # machine support
  

diff --combined arch/arm/plat-samsung/Kconfig
index 7a36cf8,78b8b89..5349d21
--- 1/arch/arm/plat-samsung/Kconfig
--- 2/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -160,11 -160,6 +160,11 @@@ config S3C_DEV_HSMMC
        help
          Compile in platform device definitions for HSMMC channel 2
  
 +config S3C_DEV_HWMON
 +      bool
 +      help
 +          Compile in platform device definitions for HWMON
 +
  config S3C_DEV_I2C1
        bool
        help
@@@ -203,6 -198,12 +203,12 @@@ config S3C_DM
        help
          Internal configuration for S3C DMA core
  
+ config S3C_PL330_DMA
+       bool
+       select PL330
+       help
+         S3C DMA API Driver for PL330 DMAC.
+ 
  comment "Power management"
  
  config SAMSUNG_PM_DEBUG

diff --combined arch/arm/plat-samsung/Makefile
index 0ad820a,05718a3..ca60367
--- 1/arch/arm/plat-samsung/Makefile
--- 2/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -33,7 -33,6 +33,7 @@@ obj-$(CONFIG_S3C_ADC) += adc.
  obj-$(CONFIG_S3C_DEV_HSMMC)   += dev-hsmmc.o
  obj-$(CONFIG_S3C_DEV_HSMMC1)  += dev-hsmmc1.o
  obj-$(CONFIG_S3C_DEV_HSMMC2)  += dev-hsmmc2.o
 +obj-$(CONFIG_S3C_DEV_HWMON)   += dev-hwmon.o
  obj-y                         += dev-i2c0.o
  obj-$(CONFIG_S3C_DEV_I2C1)    += dev-i2c1.o
  obj-$(CONFIG_S3C_DEV_FB)      += dev-fb.o
@@@ -46,6 -45,8 +46,8 @@@ obj-$(CONFIG_S3C_DEV_NAND)    += dev-nand.
  
  obj-$(CONFIG_S3C_DMA)         += dma.o
  
+ obj-$(CONFIG_S3C_PL330_DMA)   += s3c-pl330.o
+ 
  # PM support
  
  obj-$(CONFIG_PM)              += pm.o