From 85f3aa86478fdc240f3f69256ed8f62e9d58dba5 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 15 Jan 2006 02:01:39 +0100
Subject: [PATCH] --- yaml --- r: 18586 b: refs/heads/master c:
 750c902ef4a1956cecbc8fb590ce2dad5b02eab9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1e1d56d10148..e972fc87811c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 575c96871832e91983248aebb02fc072e5fd17c9
+refs/heads/master: 750c902ef4a1956cecbc8fb590ce2dad5b02eab9
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index 5ec248cb7f4a..9fd8d4f03595 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -38,7 +38,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
 	bool "Software Suspend"
-	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP)
+	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.