Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262657AbUKXNYq (ORCPT ); Wed, 24 Nov 2004 08:24:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262689AbUKXNXh (ORCPT ); Wed, 24 Nov 2004 08:23:37 -0500 Received: from pop5-1.us4.outblaze.com ([205.158.62.125]:60308 "HELO pop5-1.us4.outblaze.com") by vger.kernel.org with SMTP id S262659AbUKXNC6 (ORCPT ); Wed, 24 Nov 2004 08:02:58 -0500 Subject: Suspend 2 merge: 26/51: Kconfig and makefile. From: Nigel Cunningham Reply-To: ncunningham@linuxmail.org To: Linux Kernel Mailing List In-Reply-To: <1101292194.5805.180.camel@desktop.cunninghams> References: <1101292194.5805.180.camel@desktop.cunninghams> Content-Type: text/plain Message-Id: <1101296580.5805.292.camel@desktop.cunninghams> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6-1mdk Date: Wed, 24 Nov 2004 23:59:16 +1100 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7433 Lines: 186 Here are the changes to kernel/power/Makefile|Kconfig diff -ruN 811-Kconfig-and-Makefile-for-suspend2-old/kernel/power/Kconfig 811-Kconfig-and-Makefile-for-suspend2-new/kernel/power/Kconfig --- 811-Kconfig-and-Makefile-for-suspend2-old/kernel/power/Kconfig 2004-11-24 09:53:12.000000000 +1100 +++ 811-Kconfig-and-Makefile-for-suspend2-new/kernel/power/Kconfig 2004-11-24 18:51:15.213707144 +1100 @@ -30,6 +30,8 @@ bool "Software Suspend (EXPERIMENTAL)" depends on EXPERIMENTAL && PM && SWAP ---help--- + Pavel's original version. + Enable the possibility of suspending the machine. It doesn't need APM. You may suspend your machine by 'swsusp' or 'shutdown -z