From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Aug 2012 06:41:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20120820~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2492b0b7c38747cc003440d576eb11e07adaca88;p=karo-tx-linux.git

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

2492b0b7c38747cc003440d576eb11e07adaca88
diff --cc arch/arm/Kconfig
index 7a7b2e32a3b1,35a0e5fa4097..33c22d9da82c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -676,8 -689,10 +676,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).