From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LDRZk-0008N2-5N
	for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:42:36 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LDRZj-0008Ml-QW
	for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:42:35 -0500
Received: from [199.232.76.173] (port=59844 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LDRZj-0008Mg-Gz
	for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:42:35 -0500
Received: from savannah.gnu.org ([199.232.41.3]:43652 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LDRZj-0007yB-8M
	for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:42:35 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LDRZi-0002Kn-OP
	for qemu-devel@nongnu.org; Thu, 18 Dec 2008 22:42:34 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LDRZi-0002Kj-Fh
	for qemu-devel@nongnu.org; Thu, 18 Dec 2008 22:42:34 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LDRZi-0002Kj-Fh@cvs.savannah.gnu.org>
Date: Thu, 18 Dec 2008 22:42:34 +0000
Subject: [Qemu-devel] [6084] Fix warnings introduced by commit 6081
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6084
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6084
Author:   aurel32
Date:     2008-12-18 22:42:34 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Fix warnings introduced by commit 6081

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/hpet.c
    trunk/hw/pc.h
    trunk/monitor.c

Modified: trunk/hw/hpet.c
===================================================================
--- trunk/hw/hpet.c	2008-12-18 22:42:23 UTC (rev 6083)
+++ trunk/hw/hpet.c	2008-12-18 22:42:34 UTC (rev 6084)
@@ -26,13 +26,11 @@
  */
 
 #include "hw.h"
+#include "pc.h"
 #include "console.h"
 #include "qemu-timer.h"
 #include "hpet_emul.h"
 
-extern void hpet_pit_disable(void);
-extern void hpet_pit_enable(void);
-
 //#define HPET_DEBUG
 #ifdef HPET_DEBUG
 #define dprintf printf

Modified: trunk/hw/pc.h
===================================================================
--- trunk/hw/pc.h	2008-12-18 22:42:23 UTC (rev 6083)
+++ trunk/hw/pc.h	2008-12-18 22:42:34 UTC (rev 6084)
@@ -60,6 +60,9 @@
 int pit_get_mode(PITState *pit, int channel);
 int pit_get_out(PITState *pit, int channel, int64_t current_time);
 
+void hpet_pit_disable(void);
+void hpet_pit_enable(void);
+
 /* vmport.c */
 void vmport_init(void);
 void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque);

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c	2008-12-18 22:42:23 UTC (rev 6083)
+++ trunk/monitor.c	2008-12-18 22:42:34 UTC (rev 6084)
@@ -252,10 +252,12 @@
         term_printf("%s\n", qemu_name);
 }
 
+#if defined(TARGET_I386)
 static void do_info_hpet(void)
 {
     term_printf("HPET is %s by QEMU\n", (no_hpet) ? "disabled" : "enabled");
 }
+#endif
 
 static void do_info_uuid(void)
 {