From: Colin Cross <ccross@android.com>
Date: Fri, 8 Oct 2010 02:22:34 +0000 (-0700)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~469
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48b97d5a9fda8f632a6fcd17d766f62422aef793;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/mach-tegra/Kconfig

Change-Id: I65b3fafd22be87f9a93cae2d225dd24c174eb7a9
---

48b97d5a9fda8f632a6fcd17d766f62422aef793
diff --cc arch/arm/mach-tegra/Kconfig
index 67b931344722,0bd7b41592be..f89ae1c5795a
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -79,13 -66,13 +79,20 @@@ 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"
+ 
 +config WIFI_CONTROL_FUNC
 +	bool "Enable WiFi control function abstraction"
 +	help
 +	  Enables Power/Reset/Carddetect function abstraction
 +
 +source "arch/arm/mach-tegra/nv/Kconfig"
 +
  endif
  
  config TEGRA_IOVMM_GART