git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
Makefile
diff --git
a/arch/x86/xen/Makefile
b/arch/x86/xen/Makefile
index
3326204
..
add2c2d
100644
(file)
--- 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 \
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