diff options
| -rw-r--r-- | kernel/power/Kconfig | 12 | ||||
| -rw-r--r-- | kernel/power/Makefile | 3 | ||||
| -rw-r--r-- | kernel/power/pmdisk.c | 35 | ||||
| -rw-r--r-- | kernel/power/power.h | 2 |
4 files changed, 2 insertions, 50 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 817e30833e6a..4d67db96e73b 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -42,18 +42,6 @@ config SOFTWARE_SUSPEND For more information take a look at Documentation/power/swsusp.txt. -config PM_DISK - bool "PMDisk Support" - depends on SOFTWARE_SUSPEND && X86 && !X86_64 - ---help--- - - This option enables an alternative implementation of Suspend-to-Disk. - It is functionally equivalent to Software Suspend, and uses many of - the same internal routines. But, it offers a slightly different - interface. - - If unsure, Say N. - config PM_STD_PARTITION string "Default resume partition" depends on SOFTWARE_SUSPEND diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 2509213f50f2..de024ffae3f3 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -2,7 +2,6 @@ swsusp-smp-$(CONFIG_SMP) += smp.o obj-y := main.o process.o console.o pm.o -obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o $(swsusp-smp-y) -obj-$(CONFIG_PM_DISK) += disk.o pmdisk.o +obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o $(swsusp-smp-y) disk.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o diff --git a/kernel/power/pmdisk.c b/kernel/power/pmdisk.c deleted file mode 100644 index 21186ab859a3..000000000000 --- a/kernel/power/pmdisk.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * kernel/power/pmdisk.c - Suspend-to-disk implmentation - * - * This STD implementation is initially derived from swsusp (suspend-to-swap). - * The original copyright on that was: - * - * Copyright (C) 1998-2001 Gabor Kuti <seasons@fornax.hu> - * Copyright (C) 1998,2001,2002 Pavel Machek <pavel@suse.cz> - * - * The additional parts are: - * - * Copyright (C) 2003 Patrick Mochel - * Copyright (C) 2003 Open Source Development Lab - * - * This file is released under the GPLv2. - * - * For more information, please see the text files in Documentation/power/ - * - */ - -#undef DEBUG - -#include <linux/mm.h> -#include <linux/bio.h> -#include <linux/suspend.h> -#include <linux/version.h> -#include <linux/reboot.h> -#include <linux/device.h> -#include <linux/swapops.h> -#include <linux/bootmem.h> - -#include <asm/mmu_context.h> - -#include "power.h" - diff --git a/kernel/power/power.h b/kernel/power/power.h index 69c693cea1b5..cd6a3493cc0d 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -23,7 +23,7 @@ struct swsusp_info { -#ifdef CONFIG_PM_DISK +#ifdef CONFIG_SOFTWARE_SUSPEND extern int pm_suspend_disk(void); #else |