diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-08 02:20:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-08 02:20:26 -0400 |
| commit | 19fd61785a580c60cba900c5171bfadb57dd5056 (patch) | |
| tree | 1e491fb014be0dc03f4b6755bb94e73afd38c455 /arch/x86/xen/Makefile | |
| parent | 57569d0e12eaf31717e295960cd2a26f626c8e5b (diff) | |
| parent | 8028837d71ba9904b17281b40f94b93e947fbe38 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/xen/Makefile')
| -rw-r--r-- | arch/x86/xen/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 45e94aca5bce..3326204e251f 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
| @@ -15,7 +15,7 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ | |||
| 15 | grant-table.o suspend.o platform-pci-unplug.o \ | 15 | grant-table.o suspend.o platform-pci-unplug.o \ |
| 16 | p2m.o | 16 | p2m.o |
| 17 | 17 | ||
| 18 | obj-$(CONFIG_FUNCTION_TRACER) += trace.o | 18 | obj-$(CONFIG_FTRACE) += trace.o |
| 19 | 19 | ||
| 20 | obj-$(CONFIG_SMP) += smp.o | 20 | obj-$(CONFIG_SMP) += smp.o |
| 21 | obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o | 21 | obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o |