diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-10-03 07:28:26 -0400 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-11-29 07:59:14 -0500 |
| commit | c61ba7291b81ed7fd8c1dba1b45d05cae3f150f7 (patch) | |
| tree | 3a45b6b3ca35eb5f03be0fe9753af144124d26b0 /drivers | |
| parent | c2374bf57e7861039bb129ead538515502ef7860 (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')
| -rw-r--r-- | drivers/xen/Makefile | 4 |
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 @@ | |||
| 1 | ifneq ($(CONFIG_ARM),y) | 1 | ifneq ($(CONFIG_ARM),y) |
| 2 | obj-y += manage.o balloon.o | 2 | obj-y += manage.o |
| 3 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o | 3 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o |
| 4 | endif | 4 | endif |
| 5 | obj-y += grant-table.o features.o events.o | 5 | obj-y += grant-table.o features.o events.o balloon.o |
| 6 | obj-y += xenbus/ | 6 | obj-y += xenbus/ |
| 7 | 7 | ||
| 8 | nostackp := $(call cc-option, -fno-stack-protector) | 8 | nostackp := $(call cc-option, -fno-stack-protector) |