From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 06:07:39 +0000 (+1000)
Subject: Merge remote-tracking branch 'renesas/next'
X-Git-Tag: next-20130628~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=33a08966f36323b116d69d525d7a5bacc407e0f5;p=karo-tx-linux.git

Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/clock-r8a7778.c
	arch/arm/mach-shmobile/include/mach/r8a7778.h
---

33a08966f36323b116d69d525d7a5bacc407e0f5
diff --cc arch/arm/mach-shmobile/Kconfig
index 3912ce91fee4,e46bc94c0634..cf53109d4849
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -23,9 -23,11 +23,11 @@@ config ARCH_R8A73A
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select ARM_GIC
  	select CPU_V7
 -	select ARM_ARCH_TIMER
 +	select HAVE_ARM_ARCH_TIMER
  	select SH_CLK_CPG
  	select RENESAS_IRQC
+ 	select ARCH_HAS_CPUFREQ
+ 	select ARCH_HAS_OPP
  
  config ARCH_R8A7740
  	bool "R-Mobile A1 (R8A77400)"