From e78c50e6b9434aef6e4d31606da04539ade6d483 Mon Sep 17 00:00:00 2001
From: Peter De Schrijver <pdeschrijver@nvidia.com>
Date: Thu, 23 Feb 2012 18:20:56 +0200
Subject: [PATCH] --- yaml --- r: 295665 b: refs/heads/master c:
 f6a1ba67362fe78a1ec81c355ee638c70689b5d7 h: refs/heads/master i:   295663:
 ddd3bad0d6c5f17bb5fb5b0e6c637c978367da5c v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-tegra/common.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 45ea34ec2469..4155eecefe7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4265cbfd8dc1ae230d65f09cce9ce7f0c51a3c10
+refs/heads/master: f6a1ba67362fe78a1ec81c355ee638c70689b5d7
diff --git a/trunk/arch/arm/mach-tegra/common.c b/trunk/arch/arm/mach-tegra/common.c
index 2db20da1d585..fac449e84d80 100644
--- a/trunk/arch/arm/mach-tegra/common.c
+++ b/trunk/arch/arm/mach-tegra/common.c
@@ -95,8 +95,6 @@ static void __init tegra_init_cache(u32 tag_latency, u32 data_latency)
 #ifdef CONFIG_ARCH_TEGRA_2x_SOC
 void __init tegra20_init_early(void)
 {
-	disable_hlt();  /* idle WFI usage needs to be confirmed */
-
 	tegra_init_fuse();
 	tegra2_init_clocks();
 	tegra_clk_init_from_table(tegra20_clk_init_table);