From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTg-00005f-EG for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwvTY-0003bf-K0 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:44 -0400 Received: from cantor2.suse.de ([195.135.220.15]:61000 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTY-0003ap-BL for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:36 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C2D6BA5386 for ; Wed, 10 Jul 2013 16:34:35 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 10 Jul 2013 16:33:51 +0200 Message-Id: <1373466860-32732-15-git-send-email-afaerber@suse.de> In-Reply-To: <1373466860-32732-1-git-send-email-afaerber@suse.de> References: <1373466860-32732-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 14/43] timer/arm_mptimer: Build arm_mptimer only once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Since current_cpu is CPUState it no longer depends on CPUARMState. Signed-off-by: Andreas F=C3=A4rber --- hw/timer/Makefile.objs | 2 +- hw/timer/arm_mptimer.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 32b5c1a..eca5905 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -1,4 +1,5 @@ common-obj-$(CONFIG_ARM_TIMER) +=3D arm_timer.o +common-obj-$(CONFIG_ARM_MPTIMER) +=3D arm_mptimer.o common-obj-$(CONFIG_CADENCE) +=3D cadence_ttc.o common-obj-$(CONFIG_DS1338) +=3D ds1338.o common-obj-$(CONFIG_HPET) +=3D hpet.o @@ -25,5 +26,4 @@ obj-$(CONFIG_PXA2XX) +=3D pxa2xx_timer.o obj-$(CONFIG_SH4) +=3D sh_timer.o obj-$(CONFIG_TUSB6010) +=3D tusb6010.o =20 -obj-$(CONFIG_ARM_MPTIMER) +=3D arm_mptimer.o obj-$(CONFIG_MC146818RTC) +=3D mc146818rtc.o diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index fbc69c9..0ceb240 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -21,6 +21,7 @@ =20 #include "hw/sysbus.h" #include "qemu/timer.h" +#include "qom/cpu.h" =20 /* This device implements the per-cpu private timer and watchdog block * which is used in both the ARM11MPCore and Cortex-A9MP. --=20 1.8.1.4