summaryrefslogtreecommitdiff
path: root/drivers/xen/Makefile
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-10-03 12:28:26 +0100
committerIan Campbell <ian.campbell@citrix.com>2012-11-29 12:59:14 +0000
commitc61ba7291b81ed7fd8c1dba1b45d05cae3f150f7 (patch)
tree3a45b6b3ca35eb5f03be0fe9753af144124d26b0 /drivers/xen/Makefile
parentc2374bf57e7861039bb129ead538515502ef7860 (diff)
xen: arm: enable balloon driver
The code is now in a state where can just enable it. Drop the *_xenballloned_pages duplicates since these are now supplied by the balloon code. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/Makefile')
-rw-r--r--drivers/xen/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 0e8637035457..909bb56e3ade 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,8 +1,8 @@
ifneq ($(CONFIG_ARM),y)
-obj-y += manage.o balloon.o
+obj-y += manage.o
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
endif
-obj-y += grant-table.o features.o events.o
+obj-y += grant-table.o features.o events.o balloon.o
obj-y += xenbus/
nostackp := $(call cc-option, -fno-stack-protector)