Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request...

[mirror_qemu.git] / hw / arm / digic.c

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 6ef26c6bac39ffcf849ee36f281248e7343a0f4d..22434a65a28778b4fc6d32ff4c174752cf6a424a 100644 (file)
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -22,7 +22,9 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/arm/digic.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 
 #define DIGIC4_TIMER_BASE(n)    (0xc0210000 + (n) * 0x100)
@@ -35,7 +37,8 @@ static void digic_init(Object *obj)
     int i;
 
     object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),
-                            "arm946-" TYPE_ARM_CPU, &error_abort, NULL);
+                            ARM_CPU_TYPE_NAME("arm946"),
+                            &error_abort, NULL);
 
     for (i = 0; i < DIGIC4_NB_TIMERS; i++) {
 #define DIGIC_TIMER_NAME_MLEN    11