Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[linux-2.6] / arch / x86 / kernel / Makefile_64

diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
index 6e6b5909e46562bcc76fa6bdb24d253cc0b377ce..43da66213a479117a91c05f62e4b67447d412205 100644 (file)
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@@ -8,15 +8,15 @@ obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
                ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
                x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \
                setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
-               pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc_64.o bugs_64.o \
-               perfctr-watchdog.o
+               pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
+               perfctr-watchdog.o i8253.o
 
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-$(CONFIG_X86_MCE)          += mce_64.o therm_throt.o
 obj-$(CONFIG_X86_MCE_INTEL)    += mce_intel_64.o
 obj-$(CONFIG_X86_MCE_AMD)      += mce_amd_64.o
-obj-$(CONFIG_MTRR)             += ../../x86/kernel/cpu/mtrr/
-obj-$(CONFIG_ACPI)             += ../../x86/kernel/acpi/
+obj-$(CONFIG_MTRR)             += cpu/mtrr/
+obj-$(CONFIG_ACPI)             += acpi/
 obj-$(CONFIG_X86_MSR)          += msr.o
 obj-$(CONFIG_MICROCODE)                += microcode.o
 obj-$(CONFIG_X86_CPUID)                += cpuid.o
@@ -27,7 +27,7 @@ obj-$(CONFIG_KEXEC)           += machine_kexec_64.o relocate_kernel_64.o crash_64.o
 obj-$(CONFIG_CRASH_DUMP)       += crash_dump_64.o
 obj-$(CONFIG_PM)               += suspend_64.o
 obj-$(CONFIG_HIBERNATION)      += suspend_asm_64.o
-obj-$(CONFIG_CPU_FREQ)         += ../../x86/kernel/cpu/cpufreq/
+obj-$(CONFIG_CPU_FREQ)         += cpu/cpufreq/
 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
 obj-$(CONFIG_IOMMU)            += pci-gart_64.o aperture_64.o
 obj-$(CONFIG_CALGARY_IOMMU)    += pci-calgary_64.o tce_64.o
@@ -48,7 +48,7 @@ obj-y                         += pcspeaker.o
 
 CFLAGS_vsyscall_64.o           := $(PROFILING) -g0
 
-therm_throt-y                   += ../../x86/kernel/cpu/mcheck/therm_throt.o
-intel_cacheinfo-y              += ../../x86/kernel/cpu/intel_cacheinfo.o
-addon_cpuid_features-y         += ../../x86/kernel/cpu/addon_cpuid_features.o
-perfctr-watchdog-y             += ../../x86/kernel/cpu/perfctr-watchdog.o
+therm_throt-y                   += cpu/mcheck/therm_throt.o
+intel_cacheinfo-y              += cpu/intel_cacheinfo.o
+addon_cpuid_features-y         += cpu/addon_cpuid_features.o
+perfctr-watchdog-y             += cpu/perfctr-watchdog.o