Merge tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[~shefty/rdma-dev.git] / drivers / xen / Makefile

diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 74354708c6c4e7dd9040ead14affbfa88924ca74..fb213cf81a7bc79a94bea376ab7e540cfddaec95 100644 (file)
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,9 +1,9 @@
 ifneq ($(CONFIG_ARM),y)
 ifneq ($(CONFIG_ARM),y)

-obj-y  += manage.o balloon.o
+obj-y  += manage.o

 obj-$(CONFIG_HOTPLUG_CPU)              += cpu_hotplug.o
 endif
 obj-$(CONFIG_X86)                      += fallback.o
 obj-$(CONFIG_HOTPLUG_CPU)              += cpu_hotplug.o
 endif
 obj-$(CONFIG_X86)                      += fallback.o

-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)
 obj-y  += xenbus/
 
 nostackp := $(call cc-option, -fno-stack-protector)


@@ -11,7 +11,8 @@ CFLAGS_features.o                     := $(nostackp)
 
 dom0-$(CONFIG_PCI) += pci.o
 dom0-$(CONFIG_USB_SUPPORT) += dbgp.o
 
 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
 dom0-$(CONFIG_X86) += pcpu.o
 obj-$(CONFIG_XEN_DOM0)                 += $(dom0-y)
 obj-$(CONFIG_BLOCK)                    += biomerge.o