diff options
| author | Nigel Cunningham | 2009-12-06 16:16:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2009-12-06 16:16:07 +0100 |
| commit | 8e60c6a1348e17e68ad73589a52a03876e7059be (patch) | |
| tree | 320d06254eabd0367e36c65233e6394f83308e8e /kernel/power/Makefile | |
| parent | PM / Hibernate: Move swap functions to kernel/power/swap.c. (diff) | |
| download | kernel-qcow2-linux-8e60c6a1348e17e68ad73589a52a03876e7059be.tar.gz kernel-qcow2-linux-8e60c6a1348e17e68ad73589a52a03876e7059be.tar.xz kernel-qcow2-linux-8e60c6a1348e17e68ad73589a52a03876e7059be.zip | |
PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
Shift the remaining declaration of the variable in_suspend and the
function swsusp_show_speed from swsusp.c to hibernate.c, and delete
swsusp.c.
Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index c3b81c30e5d5..43191815f874 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_PM_SLEEP) += console.o obj-$(CONFIG_FREEZER) += process.o obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o -obj-$(CONFIG_HIBERNATION) += swsusp.o hibernate.o snapshot.o swap.o user.o +obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o obj-$(CONFIG_HIBERNATION_NVS) += hibernate_nvs.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |