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

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

76bf6ee37a5956604031e2137c00a5eabb3b38fe
diff --cc arch/arm/mach-tegra/Kconfig
index 3fd7f6b615a6,8269eea7ee77..858f6cf7aa1d
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -86,13 -73,12 +86,17 @@@ config TEGRA_FIQ_DEBUGGE
  	help
  	  Enables the FIQ serial debugger on Tegra"
  
 +config WIFI_CONTROL_FUNC
 +	bool "Enable WiFi control function abstraction"
 +	help
 +	  Enables Power/Reset/Carddetect function abstraction
 +
  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