From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 3 Jan 2011 09:59:54 +0000 (+0900)
Subject: Merge branch 'next-s5pv310' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6906c3e29a4a28660f70421935c91cf6b8ab1e1;p=linux-beck.git

Merge branch 'next-s5pv310' into for-next

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

c6906c3e29a4a28660f70421935c91cf6b8ab1e1
diff --cc arch/arm/mach-s5pv310/Makefile
index e01a4d050a4c,ef9650827136..651f1933e228
--- a/arch/arm/mach-s5pv310/Makefile
+++ b/arch/arm/mach-s5pv310/Makefile
@@@ -13,7 -13,8 +13,8 @@@ obj-				:
  # Core support for S5PV310 system
  
  obj-$(CONFIG_CPU_S5PV310)	+= cpu.o init.o clock.o irq-combiner.o
 -obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o gpiolib.o irq-eint.o
 +obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o gpiolib.o irq-eint.o dma.o
+ obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
  
  obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
  obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o