summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2002-05-21 01:57:49 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-21 01:57:49 -0700
commit542f96a52f55f50dae8b82e11dac096b094202f0 (patch)
tree4b15d74e79d2d137a36f37b93b9494ddeedaeeef /kernel/Makefile
parent79998decd54d550b61538a9248dc49b8db9a01e5 (diff)
[PATCH] suspend-to-{RAM,disk}
Here's suspend-to-{RAM,disk} combined patch for 2.5.17. Suspend-to-disk is pretty stable and was tested in 2.4-ac. Suspend-to-RAM is little more experimental, but works for me, and is certainly better than disk-eating version currently in kernel. Major parts are: process stopper, S3 specific code, S4 specific code.
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 2c8154ed2778..23efe9a8698d 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -10,7 +10,7 @@
O_TARGET := kernel.o
export-objs = signal.o sys.o kmod.o context.o ksyms.o pm.o exec_domain.o \
- printk.o platform.o
+ printk.o platform.o suspend.o
obj-y = sched.o dma.o fork.o exec_domain.o panic.o printk.o \
module.o exit.o itimer.o info.o time.o softirq.o resource.o \
@@ -21,6 +21,7 @@ obj-$(CONFIG_UID16) += uid16.o
obj-$(CONFIG_MODULES) += ksyms.o
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
+obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
ifneq ($(CONFIG_IA64),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is