diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 12:08:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 12:08:30 -0400 |
| commit | 063402356280a7b262952d6351d21315336f657b (patch) | |
| tree | e6fae7db15d0f4cbb9b9b7aa2b5bc176b4bf60f5 /arch/x86/xen/Makefile | |
| parent | f9a36fa5413f1b2694841c410a6fdb4666e78f16 (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into x86/kconfig
Diffstat (limited to 'arch/x86/xen/Makefile')
| -rw-r--r-- | arch/x86/xen/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 6dcefba7836f..3b767d03fd6a 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
| @@ -6,7 +6,8 @@ CFLAGS_REMOVE_irq.o = -pg | |||
| 6 | endif | 6 | endif |
| 7 | 7 | ||
| 8 | obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ | 8 | obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ |
| 9 | time.o xen-asm_$(BITS).o grant-table.o suspend.o | 9 | time.o xen-asm.o xen-asm_$(BITS).o \ |
| 10 | grant-table.o suspend.o | ||
| 10 | 11 | ||
| 11 | obj-$(CONFIG_SMP) += smp.o spinlock.o | 12 | obj-$(CONFIG_SMP) += smp.o spinlock.o |
| 12 | obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o \ No newline at end of file | 13 | obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o \ No newline at end of file |