From 014cdd6e05e9f2f8744412d18f5f278ff1b40135 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 25 Jun 2005 14:55:17 -0700 Subject: [PATCH] --- yaml --- r: 3255 b: refs/heads/master c: 19c324397a55edf122822f829779b46b9cb385dd h: refs/heads/master i: 3253: 98897bd2a353668d67652fff560f2adaf1e57d70 3251: 5cdf1052676fce5b9a380c07088a03e097e54a8e 3247: db1ed536c4219ddffa5dff052b9f7196b75b596c v: v3 --- [refs] | 2 +- trunk/kernel/power/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 89a2edfc577f..b4b854432460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21d6b7e18f70c847c867aafb3109405b48424388 +refs/heads/master: 19c324397a55edf122822f829779b46b9cb385dd diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index fdb377636505..2c7121d9bff1 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/kernel/power/Kconfig @@ -27,8 +27,8 @@ config PM_DEBUG like suspend support. config SOFTWARE_SUSPEND - bool "Software Suspend (EXPERIMENTAL)" - depends on EXPERIMENTAL && PM && SWAP && (SUSPEND_SMP || !SMP) + bool "Software Suspend" + depends on EXPERIMENTAL && PM && SWAP && ((X86 && SMP) || ((FVR || PPC32 || X86) && !SMP)) ---help--- Enable the possibility of suspending the machine. It doesn't need APM.