summaryrefslogtreecommitdiff
path: root/kernel/power/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-30 01:24:36 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 03:45:38 +0400
commitb0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch)
tree895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /kernel/power/Makefile
parent6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff)
downloadlinux-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.tar.xz
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION to avoid confusion (among other things, with CONFIG_SUSPEND introduced in the next patch). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power/Makefile')
-rw-r--r--kernel/power/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 38725f526afc..c6b03764512f 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -5,6 +5,6 @@ endif
obj-y := main.o process.o console.o
obj-$(CONFIG_PM_LEGACY) += pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o swap.o user.o
+obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o
obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o