ARM: Merge for-2635/s5p-dma
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:15 +0000 (18:05 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:15 +0000 (18:05 +0900)
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2

Conflicts:
arch/arm/mach-s5pv210/Makefile

1  2 
arch/arm/mach-s5pv210/Makefile
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile

index 0acbdb34b560450241886c54c27095203d5a214a,f7f1cdce6fead6e1349862ebe18e71cff5350eb6..192deac8aaab68790a7877af315f0d246204f845
@@@ -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
  
Simple merge
Simple merge