summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-01-06 21:14:04 +0100
committerLen Brown <len.brown@intel.com>2009-01-16 14:32:17 -0500
commit33f1d7ecc6cffff3c618a02295de969ebbacd95d (patch)
tree66e5bc12c253f1b39abc468fbbf15d9cb455245d /kernel/power
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadblackbird-op-linux-33f1d7ecc6cffff3c618a02295de969ebbacd95d.tar.gz
blackbird-op-linux-33f1d7ecc6cffff3c618a02295de969ebbacd95d.zip
PM: Fix freezer compilation if PM_SLEEP is unset
Freezer fails to compile if with the following configuration settings: CONFIG_CGROUPS=y CONFIG_CGROUP_FREEZER=y CONFIG_MODULES=y CONFIG_FREEZER=y CONFIG_PM=y CONFIG_PM_SLEEP=n Fix this by making process.o compilation depend on CONFIG_FREEZER. Reported-by: Cheng Renquan <crquan@gmail.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 597823b5b700..d7a10167a25b 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -4,7 +4,8 @@ EXTRA_CFLAGS += -DDEBUG
endif
obj-y := main.o
-obj-$(CONFIG_PM_SLEEP) += process.o console.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
obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o
OpenPOWER on IntegriCloud