From 202751083d99fdd068fc6299d4585f423ddb79e0 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 5 Sep 2012 09:58:27 -0600
Subject: [PATCH] --- yaml --- r: 326370 b: refs/heads/master c:
 4b1082ca8cd3bec99fc0ce020a8ba1fa3aa8e22a h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 93e81ae285a4..ce714ce80a7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b48d6aab37403fb34fe18dd90791cb60f3265f13
+refs/heads/master: 4b1082ca8cd3bec99fc0ce020a8ba1fa3aa8e22a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index c5f9ae5dbd1a..f134dd88fe88 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -2313,7 +2313,7 @@ menu "Power management options"
 source "kernel/power/Kconfig"
 
 config ARCH_SUSPEND_POSSIBLE
-	depends on !ARCH_S5PC100 && !ARCH_TEGRA
+	depends on !ARCH_S5PC100
 	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
 		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK
 	def_bool y