From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw16q-0004vJ-UC for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw16p-00046H-UD for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:20 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:49027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw16p-00046B-Ru for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:19 -0400 Received: by vxi32 with SMTP id 32so649475vxi.4 for ; Tue, 23 Aug 2011 17:14:19 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 23 Aug 2011 17:13:40 -0700 Message-Id: <1314144835-29098-2-git-send-email-rth@twiddle.net> In-Reply-To: <1314144835-29098-1-git-send-email-rth@twiddle.net> References: <1314144835-29098-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 01/16] fixup: merge with last sm501 patch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: avi@redhat.com --- 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