From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 19 May 2010 09:05:15 +0000 (+0900)
Subject: ARM: Merge for-2635/s5p-dma
X-Git-Tag: v2.6.35-rc1~500^2~19
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=1e8ff636beb6ee5c87868a6081cc4f95b1ccd713;p=safe%2Fjmp%2Flinux-2.6

ARM: Merge for-2635/s5p-dma

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

Conflicts:
	arch/arm/mach-s5pv210/Makefile
---

1e8ff636beb6ee5c87868a6081cc4f95b1ccd713
diff --cc arch/arm/mach-s5pv210/Makefile
index 0acbdb3,f7f1cdc..192deac
--- a/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