---

yaml --- r: 263177 b: refs/heads/master c: 60c5f08 h: refs/heads/master i: 263175: df7a6c8 v: v3
git-mirror · Aug 22, 2011 · ef89c94 · ef89c94
1 parent 3343648
commit ef89c94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c05c4bed4ccce3f22f6d7899b308faae24ad198
+refs/heads/master: 60c5f08e154fd235056645e050f2cd5671b19125
diff --git a/trunk/arch/x86/xen/Makefile b/trunk/arch/x86/xen/Makefile
@@ -15,7 +15,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 			grant-table.o suspend.o platform-pci-unplug.o \
 			p2m.o
 
-obj-$(CONFIG_FTRACE) += trace.o
+obj-$(CONFIG_EVENT_TRACING) += trace.o
 
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o