Merge branch 'qemu-cvs'

Conflicts:
	qemu/Makefile
	qemu/Makefile.target
	qemu/block-raw-posix.c
	qemu/configure
	qemu/cutils.c
	qemu/dyngen.c
	qemu/hw/cirrus_vga.c
	qemu/hw/e1000.c
	qemu/hw/pci.c
	qemu/hw/vga.c
	qemu/osdep.c
	qemu/pc-bios/Makefile
	qemu/qemu-common.h
	qemu/target-ppc/helper.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 0 insertions, 1 deletions

diff --git a/configure b/configure
index 4e88961c..d2883a74 100755
--- a/configure
+++ b/configure
@@ -142,7 +142,6 @@ fi
 #configure qemu
 (cd qemu; ./configure --target-list=$target_exec \
     --disable-kqemu \
-    --disable-gcc-check \
     --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \
     --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
     --kerneldir="$libkvm_kerneldir" \