Messages in this thread Patch in this message | | | Date | Thu, 21 Apr 2005 13:07:24 +0200 | From | Pavel Machek <> | Subject | [patch] swsusp: kill config_pm_disk |
| |
CONFIG_PM_DISK is long gone, but it still managed to survived at few places.
Signed-off-by: Pavel Machek <pavel@suse.cz>
--- clean/arch/i386/mm/init.c 2005-03-19 00:31:06.000000000 +0100 +++ linux/arch/i386/mm/init.c 2005-03-25 09:08:37.000000000 +0100 @@ -352,7 +352,7 @@ #endif } -#if defined(CONFIG_PM_DISK) || defined(CONFIG_SOFTWARE_SUSPEND) +#ifdef CONFIG_SOFTWARE_SUSPEND /* * Swap suspend & friends need this for resume because things like the intel-agp * driver might have split up a kernel 4MB mapping. --- clean/mm/page_io.c 2005-04-05 10:55:35.000000000 +0200 +++ linux/mm/page_io.c 2005-04-05 10:57:21.000000000 +0200 @@ -127,7 +127,7 @@ return ret; } -#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_PM_DISK) +#ifdef CONFIG_SOFTWARE_SUSPEND /* * A scruffy utility function to read or write an arbitrary swap page * and wait on the I/O. The caller must have a ref on the page. --- clean/arch/i386/defconfig 2005-03-19 00:31:05.000000000 +0100 +++ linux/arch/i386/defconfig 2005-03-25 09:08:37.000000000 +0100 @@ -126,7 +126,6 @@ # CONFIG_PM=y CONFIG_SOFTWARE_SUSPEND=y -# CONFIG_PM_DISK is not set # # ACPI (Advanced Configuration and Power Interface) Support -- Boycott Kodak -- for their patent abuse against Java. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |