Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-3' into staging

[qemu.git] / hw / char / omap_uart.c

diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 5bb36ed2c1d6b176630d034daa99b2d9ccc70917..0b91693602ae25ffae73910a8161b1244df56100 100644 (file)
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -168,7 +168,7 @@ struct omap_uart_s *omap2_uart_init(MemoryRegion *sysmem,
     struct omap_uart_s *s = omap_uart_init(base, irq,
                     fclk, iclk, txdma, rxdma, label, chr);
 
-    memory_region_init_io(&s->iomem, &omap_uart_ops, s, "omap.uart", 0x100);
+    memory_region_init_io(&s->iomem, NULL, &omap_uart_ops, s, "omap.uart", 0x100);
 
     s->ta = ta;