Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / drivers / xen / Makefile

diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 56592f0d6cefff998f305bcb4a0125f9bed28e0b..363286c542906e8fde4e5fb6f87ac718938cf55e 100644 (file)
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,2 +1,4 @@
-obj-y  += grant-table.o
+obj-y  += grant-table.o features.o events.o manage.o
 obj-y  += xenbus/
+obj-$(CONFIG_XEN_XENCOMM)      += xencomm.o
+obj-$(CONFIG_XEN_BALLOON)      += balloon.o