diff --git a/[refs] b/[refs] index 47130b07fa68..585e498b1ac3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae1659ee6b4bf5e12a141d04636a3de89543c237 +refs/heads/master: 613ad4837964e9b9ea914c74e7d8f57b86b75a52 diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile index cd28aae575dd..275abfc615cb 100644 --- a/trunk/drivers/xen/Makefile +++ b/trunk/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