diff options
Diffstat (limited to 'arch/x86/kernel/Makefile_64')
-rw-r--r-- | arch/x86/kernel/Makefile_64 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index 6e6b5909e465..3ab017a0a3b9 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 | |||
@@ -15,8 +15,8 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o | |||
15 | obj-$(CONFIG_X86_MCE) += mce_64.o therm_throt.o | 15 | obj-$(CONFIG_X86_MCE) += mce_64.o therm_throt.o |
16 | obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o | 16 | obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o |
17 | obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o | 17 | obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o |
18 | obj-$(CONFIG_MTRR) += ../../x86/kernel/cpu/mtrr/ | 18 | obj-$(CONFIG_MTRR) += cpu/mtrr/ |
19 | obj-$(CONFIG_ACPI) += ../../x86/kernel/acpi/ | 19 | obj-$(CONFIG_ACPI) += acpi/ |
20 | obj-$(CONFIG_X86_MSR) += msr.o | 20 | obj-$(CONFIG_X86_MSR) += msr.o |
21 | obj-$(CONFIG_MICROCODE) += microcode.o | 21 | obj-$(CONFIG_MICROCODE) += microcode.o |
22 | obj-$(CONFIG_X86_CPUID) += cpuid.o | 22 | obj-$(CONFIG_X86_CPUID) += cpuid.o |
@@ -27,7 +27,7 @@ obj-$(CONFIG_KEXEC) += machine_kexec_64.o relocate_kernel_64.o crash_64.o | |||
27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o | 27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o |
28 | obj-$(CONFIG_PM) += suspend_64.o | 28 | obj-$(CONFIG_PM) += suspend_64.o |
29 | obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o | 29 | obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o |
30 | obj-$(CONFIG_CPU_FREQ) += ../../x86/kernel/cpu/cpufreq/ | 30 | obj-$(CONFIG_CPU_FREQ) += cpu/cpufreq/ |
31 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 31 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
32 | obj-$(CONFIG_IOMMU) += pci-gart_64.o aperture_64.o | 32 | obj-$(CONFIG_IOMMU) += pci-gart_64.o aperture_64.o |
33 | obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o | 33 | obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o |
@@ -48,7 +48,7 @@ obj-y += pcspeaker.o | |||
48 | 48 | ||
49 | CFLAGS_vsyscall_64.o := $(PROFILING) -g0 | 49 | CFLAGS_vsyscall_64.o := $(PROFILING) -g0 |
50 | 50 | ||
51 | therm_throt-y += ../../x86/kernel/cpu/mcheck/therm_throt.o | 51 | therm_throt-y += cpu/mcheck/therm_throt.o |
52 | intel_cacheinfo-y += ../../x86/kernel/cpu/intel_cacheinfo.o | 52 | intel_cacheinfo-y += cpu/intel_cacheinfo.o |
53 | addon_cpuid_features-y += ../../x86/kernel/cpu/addon_cpuid_features.o | 53 | addon_cpuid_features-y += cpu/addon_cpuid_features.o |
54 | perfctr-watchdog-y += ../../x86/kernel/cpu/perfctr-watchdog.o | 54 | perfctr-watchdog-y += cpu/perfctr-watchdog.o |