diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-11-30 17:07:59 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-11-30 17:07:59 -0500 |
| commit | 6a7ed405114b2a53ccd99631b0636aaeabf71b3e (patch) | |
| tree | f8bb0dcddc66c59843433e2283f6bea57cc8ce24 /drivers/xen/Makefile | |
| parent | a7be94ac8d69c037d08f0fd94b45a593f1d45176 (diff) | |
| parent | f832da068b0aadb15f747f6427b6bf945f525ba4 (diff) | |
| download | blackbird-op-linux-6a7ed405114b2a53ccd99631b0636aaeabf71b3e.tar.gz blackbird-op-linux-6a7ed405114b2a53ccd99631b0636aaeabf71b3e.zip | |
Merge branch 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux into stable/for-linus-3.8
* 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux:
xen: arm: implement remap interfaces needed for privcmd mappings.
xen: correctly use xen_pfn_t in remap_domain_mfn_range.
xen: arm: enable balloon driver
xen: balloon: allow PVMMU interfaces to be compiled out
xen: privcmd: support autotranslated physmap guests.
xen: add pages parameter to xen_remap_domain_mfn_range
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/Makefile')
| -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 3c397170f39c..3ee2b91ca4e0 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) |
