From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754292Ab2JBPOR (ORCPT ); Tue, 2 Oct 2012 11:14:17 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:58432 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753566Ab2JBPOP (ORCPT ); Tue, 2 Oct 2012 11:14:15 -0400 X-IronPort-AV: E=Sophos;i="4.80,524,1344211200"; d="scan'208";a="14897631" Date: Tue, 2 Oct 2012 16:13:15 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Konrad Rzeszutek Wilk CC: , , Stefano Stabellini , , Subject: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1 Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch is actually a merge conflict resolution between Konrad's Xen tree and the following commit: commit 9fa5780beea1274d498a224822397100022da7d4 Author: Jan Beulich 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. 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 Signed-off-by: Stefano Stabellini 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