From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Sep 2012 05:49:57 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20120906~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4a95db6050719e8003e88f98895249d7c60a95e;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'
---

f4a95db6050719e8003e88f98895249d7c60a95e
diff --cc arch/arm/Kconfig
index ebb9941fb42d,2dec6ec05333..d275c5f04c35
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -675,8 -683,10 +675,9 @@@ config ARCH_TEGR
  	select HAVE_CLK
  	select HAVE_SMP
  	select MIGHT_HAVE_CACHE_L2X0
 -	select NEED_MACH_IO_H if PCI
  	select ARCH_HAS_CPUFREQ
  	select USE_OF
+ 	select COMMON_CLK
  	help
  	  This enables support for NVIDIA Tegra based systems (Tegra APX,
  	  Tegra 6xx and Tegra 2 series).