diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 23:24:36 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 01:45:38 +0200 |
commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/i386/power | |
parent | Provide timespec to guests rather than jiffies clock. (diff) | |
download | linux-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.tar.xz linux-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.zip |
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')
-rw-r--r-- | arch/i386/power/Makefile | 2 |
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 @@ obj-$(CONFIG_PM) += cpu.o -obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o +obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o |