aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/mm/init.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-06-25 14:55:09 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:24:32 -0700
commit648be3188135add682349e86d46d07cc11c8eb57 (patch)
treed6c4b7e1408baebb97dc4cd8d7a435ac3eb4cad0 /arch/i386/mm/init.c
parentfc5fb2c609c6acef15a8b062063e9135fb08b4d2 (diff)
[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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/mm/init.c')
-rw-r--r--arch/i386/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 3672e2ef51a..12216b52e28 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -352,7 +352,7 @@ static void __init pagetable_init (void)
#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.