[Xen-changelog] Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1496, 2005/05/21 00:13:11+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
        into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk



 Makefile |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile     2005-05-20 
20:04:22 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile     2005-05-20 
20:04:22 -04:00
@@ -10,9 +10,9 @@
 
 obj-y  := process.o signal.o entry.o traps.o \
                time.o ioport.o ldt.o setup.o \
-               pci-dma.o i386_ksyms.o
+               pci-dma.o i386_ksyms.o irq.o
 
-c-obj-y        := semaphore.o irq.o vm86.o \
+c-obj-y        := semaphore.o vm86.o \
                ptrace.o sys_i386.o \
                i387.o dmi_scan.o bootflag.o \
                doublefault.o quirks.o
@@ -20,18 +20,19 @@
 
 obj-y                          += cpu/
 obj-y                          += timers/
-c-obj-$(CONFIG_ACPI_BOOT)      += acpi/
+obj-$(CONFIG_ACPI_BOOT)                += acpi/
 #c-obj-$(CONFIG_X86_BIOS_REBOOT)       += reboot.o
 c-obj-$(CONFIG_MCA)            += mca.o
 c-obj-$(CONFIG_X86_MSR)                += msr.o
 c-obj-$(CONFIG_X86_CPUID)      += cpuid.o
 obj-$(CONFIG_MICROCODE)                += microcode.o
 c-obj-$(CONFIG_APM)            += apm.o
-c-obj-$(CONFIG_X86_SMP)                += smp.o smpboot.o
-c-obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
-c-obj-$(CONFIG_X86_MPPARSE)    += mpparse.o
-c-obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
-c-obj-$(CONFIG_X86_IO_APIC)    += io_apic.o
+obj-$(CONFIG_X86_SMP)          += smp.o smpboot.o
+#obj-$(CONFIG_X86_TRAMPOLINE)  += trampoline.o
+obj-$(CONFIG_X86_MPPARSE)      += mpparse.o
+obj-$(CONFIG_X86_LOCAL_APIC)   += apic.o
+c-obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o
+obj-$(CONFIG_X86_IO_APIC)      += io_apic.o
 c-obj-$(CONFIG_X86_NUMAQ)      += numaq.o
 c-obj-$(CONFIG_X86_SUMMIT_NUMA)        += summit.o
 c-obj-$(CONFIG_MODULES)                += module.o

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog