Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging

[qemu.git] / hw / slavio_misc.c

diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 5a025186af8712ab200ab2342189aa4f1c4e3757..944835e8800af3adc8eed68d4033a97fb3d037c3 100644 (file)
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -499,10 +499,10 @@ static TypeInfo apc_info = {
     .class_init    = apc_class_init,
 };
 
-static void slavio_misc_register_devices(void)
+static void slavio_misc_register_types(void)
 {
     type_register_static(&slavio_misc_info);
     type_register_static(&apc_info);
 }
 
-device_init(slavio_misc_register_devices)
+type_init(slavio_misc_register_types)