[Qemu-devel] [PATCH 01/16] fixup: merge with last sm501 patch

[Richard Henderson]

---
 hw/devices.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/devices.h b/hw/devices.h
index 36c21e7..8ac384f 100644
--- a/hw/devices.h
+++ b/hw/devices.h
@@ -2,7 +2,7 @@
 #define QEMU_DEVICES_H
 
 /* ??? Not all users of this file can include cpu-common.h.  */
-typedef struct MemoryRegion MemoryRegion;
+struct MemoryRegion;
 
 /* Devices that have nowhere better to go.  */
 
@@ -60,7 +60,7 @@ qemu_irq *tc6393xb_gpio_in_get(TC6393xbState *s);
 qemu_irq tc6393xb_l3v_get(TC6393xbState *s);
 
 /* sm501.c */
-void sm501_init(MemoryRegion *address_space_mem, uint32_t base,
+void sm501_init(struct MemoryRegion *address_space_mem, uint32_t base,
                 uint32_t local_mem_bytes, qemu_irq irq,
                 CharDriverState *chr);
 
-- 
1.7.4.4