aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2012-10-02 16:00:43 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-10-02 12:34:55 -0400
commit613ad4837964e9b9ea914c74e7d8f57b86b75a52 (patch)
treea51f739a5b4aba15e2c01178547d1335f9be5e49
parentMerge branch 'xenarm-for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm into stable/for-linus-3.7 (diff)
downloadlinux-dev-613ad4837964e9b9ea914c74e7d8f57b86b75a52.tar.xz
linux-dev-613ad4837964e9b9ea914c74e7d8f57b86b75a52.zip
xen/Makefile: fix dom-y build
We need to add $(dom0-y) to obj-$(CONFIG_XEN_DOM0) after dom0-y is defined otherwise we end up adding nothing. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index cd28aae575dd..275abfc615cb 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -8,10 +8,10 @@ obj-y += xenbus/
nostackp := $(call cc-option, -fno-stack-protector)
CFLAGS_features.o := $(nostackp)
-obj-$(CONFIG_XEN_DOM0) += $(dom0-y)
dom0-$(CONFIG_PCI) += pci.o
dom0-$(CONFIG_ACPI) += acpi.o
dom0-$(CONFIG_X86) += pcpu.o
+obj-$(CONFIG_XEN_DOM0) += $(dom0-y)
obj-$(CONFIG_BLOCK) += biomerge.o
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o