From 6d975edc50ecb1ca635841df8be37f95df0c7e0d Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 18 Feb 2009 14:48:21 -0800 Subject: [PATCH] --- yaml --- r: 131490 b: refs/heads/master c: 42f5e039c3f6512271636928ddc4e7f7a0371672 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/Makefile | 1 + trunk/kernel/power/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6af9c70a02a5..a7141d0af023 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67e055d144c5b2acdc1c63811fde031263bf92c5 +refs/heads/master: 42f5e039c3f6512271636928ddc4e7f7a0371672 diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile index 170a9213c1b6..e4791b3ba55d 100644 --- a/trunk/kernel/Makefile +++ b/trunk/kernel/Makefile @@ -51,6 +51,7 @@ obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ +obj-$(CONFIG_FREEZER) += power/ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o diff --git a/trunk/kernel/power/Makefile b/trunk/kernel/power/Makefile index d7a10167a25b..720ea4f781bd 100644 --- a/trunk/kernel/power/Makefile +++ b/trunk/kernel/power/Makefile @@ -3,7 +3,7 @@ ifeq ($(CONFIG_PM_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif -obj-y := main.o +obj-$(CONFIG_PM) += main.o obj-$(CONFIG_PM_SLEEP) += console.o obj-$(CONFIG_FREEZER) += process.o obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o