From: Colin Cross <ccross@android.com>
Date: Tue, 9 Nov 2010 23:49:46 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~117
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b7aeb98256b733251847db1750626b710d4fba1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
---

1b7aeb98256b733251847db1750626b710d4fba1
diff --cc arch/arm/mach-tegra/Kconfig
index 0bd7b41592be,6f28e0e73469..ef028cd62734
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -66,15 -66,17 +66,24 @@@ config TEGRA_PW
  	help
  	  Enable support for the Tegra PWM controller(s).
  
 +config TEGRA_FIQ_DEBUGGER
 +	bool "Enable the FIQ serial debugger on Tegra"
 +	default y
 +	select FIQ_DEBUGGER
 +	help
 +	  Enables the FIQ serial debugger on Tegra"
 +
  endif
  
+ config TEGRA_CPU_DVFS
+ 	bool "Enable voltage scaling on Tegra CPU"
+ 	default y
+ 
+ config TEGRA_CORE_DVFS
+ 	bool "Enable voltage scaling on Tegra core"
+ 	depends on TEGRA_CPU_DVFS
+ 	default y
+ 
  config TEGRA_IOVMM_GART
  	bool "Enable I/O virtual memory manager for GART"
  	depends on ARCH_TEGRA_2x_SOC