From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@qumranet.com>
Subject: Re: [PATCH] qemu: remove conflicting dependency
	to	<linux/pci.h>
Date: Sun, 30 Mar 2008 12:38:05 +0300
Message-ID: <47EF5F7D.6000308@qumranet.com>
References: <20080327232723.GB15662@tapir>
	<20080327234049.GF15662@tapir>	<47EC981D.7040104@qumranet.com>
	<20080328090906.GC20149@tapir>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Cc: kvm-devel <kvm-devel@lists.sourceforge.net>
To: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Return-path: <kvm-devel-bounces@lists.sourceforge.net>
In-Reply-To: <20080328090906.GC20149@tapir>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/kvm-devel>,
	<mailto:kvm-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=kvm-devel>
List-Post: <mailto:kvm-devel@lists.sourceforge.net>
List-Help: <mailto:kvm-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/kvm-devel>,
	<mailto:kvm-devel-request@lists.sourceforge.net?subject=subscribe>
Sender: kvm-devel-bounces@lists.sourceforge.net
Errors-To: kvm-devel-bounces@lists.sourceforge.net
List-Id: kvm.vger.kernel.org

Carlo Marcelo Arenas Belon wrote:
> remove dependency to the pci linux headers added since
> c10bf6159ff24501852c91a342c3077d5388b184 and that was generating the
> following conflict :
>
>   qemu/hw/cirrus_vga.c:193:1: warning: "PCI_COMMAND_SERR" redefined
>     In file included from /usr/include/linux/pci.h:21,
>                      from qemu/hw/pci.h:6,
>                      from qemu/hw/cirrus_vga.c:31:
>     /usr/include/linux/pci_regs.h:40:1: warning: this is the location of the previous definition
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace