diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 17:24:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:45:38 -0400 |
| commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
| tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/x86_64/kernel/Makefile | |
| parent | 6c8dca5d53f95009d4fff00195bf38f277dc4366 (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/x86_64/kernel/Makefile')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 47f1dc30bf56..d1d18c1ea0f4 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile | |||
| @@ -26,7 +26,7 @@ obj-y += io_apic.o mpparse.o genapic.o genapic_flat.o | |||
| 26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o | 26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o |
| 27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | 27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o |
| 28 | obj-$(CONFIG_PM) += suspend.o | 28 | obj-$(CONFIG_PM) += suspend.o |
| 29 | obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o | 29 | obj-$(CONFIG_HIBERNATION) += suspend_asm.o |
| 30 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ | 30 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ |
| 31 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 31 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
| 32 | obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o | 32 | obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o |