From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: [PATCH] compile error when CONFIG_XEN_DOM0=n
	&&	CONFIG_XEN=y
Date: Tue, 27 Jul 2010 23:29:03 -0700
Message-ID: <4C4FCE2F.9000505@goop.org>
References: <20100727180138.GA15402@phenom.dumpdata.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <20100727180138.GA15402@phenom.dumpdata.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

  On 07/27/2010 11:01 AM, Konrad Rzeszutek Wilk wrote:
> This fixes the mentioned compile error.
>
> Please push it in xen/stable-2.6.32.x

Is this detritus from merging, or should it live on a specific topic branch?

     J

> diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
> index 6683196..6f90399 100644
> --- a/arch/x86/include/asm/xen/pci.h
> +++ b/arch/x86/include/asm/xen/pci.h
> @@ -4,7 +4,6 @@
>   #if defined(CONFIG_PCI_MSI)
>   #if defined(CONFIG_PCI_XEN)
>   int xen_register_pirq(u32 gsi, int triggering);
> -int xen_register_gsi(u32 gsi, int triggering, int polarity);
>   int xen_create_msi_irq(struct pci_dev *dev,
>   			struct msi_desc *msidesc,
>   			int type);
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>