Merge branch 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux into...

[deliverable/linux.git] / drivers / xen / Makefile

diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 0e86370354572ac7d4116eb70cf6e41d1a52cf35..3ee2b91ca4e0e193c7990655d5497f427131ba92 100644 (file)
--- 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)
@@ -10,7 +10,8 @@ CFLAGS_features.o                     := $(nostackp)
 
 dom0-$(CONFIG_PCI) += pci.o
 dom0-$(CONFIG_USB_SUPPORT) += dbgp.o
-dom0-$(CONFIG_ACPI) += acpi.o
+dom0-$(CONFIG_ACPI) += acpi.o $(xen-pad-y)
+xen-pad-$(CONFIG_X86) += xen-acpi-pad.o
 dom0-$(CONFIG_X86) += pcpu.o
 obj-$(CONFIG_XEN_DOM0)                 += $(dom0-y)
 obj-$(CONFIG_BLOCK)                    += biomerge.o