From patchwork Fri Oct 22 20:40:39 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alex Williamson <alex.williamson@redhat.com>
X-Patchwork-Id: 277851
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9MKehEk012186
	for <patchwork-kvm@patchwork.kernel.org>;
	Fri, 22 Oct 2010 20:40:44 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757316Ab0JVUkl (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Fri, 22 Oct 2010 16:40:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:24801 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755471Ab0JVUkk (ORCPT <rfc822;kvm@vger.kernel.org>);
	Fri, 22 Oct 2010 16:40:40 -0400
Received: from int-mx08.intmail.prod.int.phx2.redhat.com
	(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9MKedJd025904
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Fri, 22 Oct 2010 16:40:40 -0400
Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
	by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o9MKedl2016344; Fri, 22 Oct 2010 16:40:39 -0400
From: Alex Williamson <alex.williamson@redhat.com>
Subject: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM
To: mst@redhat.com
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, alex.williamson@redhat.com
Date: Fri, 22 Oct 2010 14:40:39 -0600
Message-ID: <20101022204037.10161.83407.stgit@s20.home>
In-Reply-To: <20101022193845.10161.52907.stgit@s20.home>
References: <20101022193845.10161.52907.stgit@s20.home>
User-Agent: StGIT/0.14.3
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 22 Oct 2010 20:40:44 +0000 (UTC)


diff --git a/Makefile.objs b/Makefile.objs
index ca2d2d0..c097d25 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -201,8 +201,6 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o
 # PCI watchdog devices
 hw-obj-y += wdt_i6300esb.o
 
-hw-obj-y += msix.o
-
 # PCI network cards
 hw-obj-y += ne2000.o
 hw-obj-y += eepro100.o
diff --git a/Makefile.target b/Makefile.target
index 347ad6b..63da13b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -185,6 +185,7 @@ obj-y += rwhandler.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o
 obj-y += memory.o
+obj-y += msix.o
 
 LIBS+=-lz
 
diff --git a/hw/msix.c b/hw/msix.c
index 4122395..23256c9 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -11,6 +11,7 @@
  * the COPYING file in the top-level directory.
  */
 
+#include "config.h"
 #include "hw.h"
 #include "msix.h"
 #include "pci.h"