diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-06-16 17:10:28 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-09 21:33:02 +0200 |
| commit | de6db419e5cfe604464a7612b5a5f9214d0af837 (patch) | |
| tree | 996284bfb6aaec241632eda4a22753a637c007dc /hw | |
| parent | 2b927571ccdb79deda74ba84ef493e6cb37eacbe (diff) | |
timer/arm_mptimer: Build arm_mptimer only once
Since current_cpu is CPUState it no longer depends on CPUARMState.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/timer/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/timer/arm_mptimer.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 32b5c1a9ba..eca590570e 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -1,4 +1,5 @@ common-obj-$(CONFIG_ARM_TIMER) += arm_timer.o +common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o common-obj-$(CONFIG_CADENCE) += cadence_ttc.o common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-$(CONFIG_HPET) += hpet.o @@ -25,5 +26,4 @@ obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o obj-$(CONFIG_SH4) += sh_timer.o obj-$(CONFIG_TUSB6010) += tusb6010.o -obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index fbc69c94b7..0ceb240490 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" +#include "qom/cpu.h" /* This device implements the per-cpu private timer and watchdog block * which is used in both the ARM11MPCore and Cortex-A9MP. |