From: Colin Cross <ccross@android.com>
Date: Thu, 9 Dec 2010 03:54:37 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~89
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=42907f1736fe39cdf39b5f583fcd6b9e4e257b18;p=firefly-linux-kernel-4.4.55.git

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

42907f1736fe39cdf39b5f583fcd6b9e4e257b18
diff --cc arch/arm/mach-tegra/Kconfig
index ef028cd62734,cfd34566ef12..8269eea7ee77
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -66,15 -66,12 +66,19 @@@ 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_EMC_SCALING_ENABLE
+ 	bool "Enable scaling the memory frequency"
+ 	default n
+ 
  config TEGRA_CPU_DVFS
  	bool "Enable voltage scaling on Tegra CPU"
  	default y