aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/power/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-29 17:24:36 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 19:45:38 -0400
commitb0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch)
tree895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/i386/power/Makefile
parent6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff)
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 'arch/i386/power/Makefile')
-rw-r--r--arch/i386/power/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/power/Makefile b/arch/i386/power/Makefile
index 2de7bbf03cd7..d764ec950065 100644
--- a/arch/i386/power/Makefile
+++ b/arch/i386/power/Makefile
@@ -1,2 +1,2 @@
1obj-$(CONFIG_PM) += cpu.o 1obj-$(CONFIG_PM) += cpu.o
2obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o 2obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o