Merge remote-tracking branch 'kraxel/usb.61' into staging

[qemu.git] / hw / omap_intc.c

diff --git a/hw/omap_intc.c b/hw/omap_intc.c
index 5aa98a8fdb6cfbb9feb38ee0b55235fac5ebd8af..5076e07ed50c44a7e6952d139a787b89688a566f 100644 (file)
--- a/hw/omap_intc.c
+++ b/hw/omap_intc.c
@@ -640,10 +640,10 @@ static TypeInfo omap2_intc_info = {
     .class_init    = omap2_intc_class_init,
 };
 
-static void omap_intc_register_device(void)
+static void omap_intc_register_types(void)
 {
     type_register_static(&omap_intc_info);
     type_register_static(&omap2_intc_info);
 }
 
-device_init(omap_intc_register_device)
+type_init(omap_intc_register_types)