diff --git a/[refs] b/[refs]
index e6245ecb5561..b812717fef90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1bb7d61233ba5fb5cd865f907a9ddcc8f8c02bd
+refs/heads/master: 09664fda48c5dd63277f1f42888ca9d5dca6037a
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