diff options
-rw-r--r-- | arch/x86_64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/suspend_asm_64.S (renamed from arch/x86_64/kernel/suspend_asm.S) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 4702333f93b1..9799e58c243a 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile | |||
@@ -26,7 +26,7 @@ obj-y += io_apic_64.o mpparse.o genapic.o genapic_flat.o | |||
26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o | 26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.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_HIBERNATION) += suspend_asm.o | 29 | obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o |
30 | obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/cpufreq/ | 30 | obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/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_64.o | 32 | obj-$(CONFIG_IOMMU) += pci-gart.o aperture_64.o |
diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm_64.S index 16d183f67bc1..16d183f67bc1 100644 --- a/arch/x86_64/kernel/suspend_asm.S +++ b/arch/x86_64/kernel/suspend_asm_64.S | |||