>>> On 02.10.12 at 17:13, Stefano Stabellini <stefano.stabell...@eu.citrix.com> >>> wrote: > This patch is actually a merge conflict resolution between Konrad's Xen > tree and the following commit: > > commit 9fa5780beea1274d498a224822397100022da7d4 > Author: Jan Beulich <jbeul...@suse.com> > Date: Tue Sep 18 12:23:02 2012 +0100 > > USB EHCI/Xen: propagate controller reset information to hypervisor > > > Compile dbgp.o only if CONFIG_USB is defined.
Now this is wrong: USB is a tristate config option, yet dbgp.o must be built in. This is why I suggested to use USB_SUPPORT (if anything at all). Jan > After all xen_dbgp_op relies on hcd_to_bus. > > This patch should be applied on top of > > http://marc.info/?l=linux-kernel&m=134919011231980&w=2 > > > Reported-by: Stephen Rothwell <s...@canb.auug.org.au> > Signed-off-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com> > > diff --cc drivers/xen/Makefile > index a4a3cab,275abfc..33711ad > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@@ -4,8 -8,11 +8,12 @@@ obj-y += xenbus > nostackp := $(call cc-option, -fno-stack-protector) > CFLAGS_features.o := $(nostackp) > > + dom0-$(CONFIG_PCI) += pci.o > + dom0-$(CONFIG_ACPI) += acpi.o > + dom0-$(CONFIG_X86) += pcpu.o > ++dom0-$(CONFIG_USB) += dbgp.o > + obj-$(CONFIG_XEN_DOM0) += $(dom0-y) > obj-$(CONFIG_BLOCK) += biomerge.o > - obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > obj-$(CONFIG_XEN_XENCOMM) += xencomm.o > obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o > obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
