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 commit 'v2.6.26' into x86/core
[pandora-kernel.git]
/
drivers
/
xen
/
Makefile
diff --git
a/drivers/xen/Makefile
b/drivers/xen/Makefile
index
56592f0
..
363286c
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