From patchwork Wed Aug 24 00:13:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EAA1AB6F71 for ; Wed, 24 Aug 2011 10:14:39 +1000 (EST) Received: from localhost ([::1]:47824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw172-0004x6-C1 for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:14:32 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=I/3wm+iuiDwjiXFcPN/7b1AhLgpwsYV1GfViHiiSt5Q=; b=mACsDqMd8H66wkJErpf64vdHXU+kq9vckIB+lRfhaJj3VYx+92Qi+pZvlMID9zFTsm WTrTgVZV5jX0ho2f2YErs2fbUocC5ttlyAMZBWfHEtUCVGO67hT57m9L18IU0+X+Shcb Pmd00IX5zquB7lqijs++exzDQr2hpFCzBb2ys= Received: by 10.52.68.204 with SMTP id y12mr847514vdt.98.1314144859371; Tue, 23 Aug 2011 17:14:19 -0700 (PDT) Received: from localhost.localdomain (cpe-66-91-180-197.hawaii.res.rr.com [66.91.180.197]) by mx.google.com with ESMTPS id es7sm441852vdb.6.2011.08.23.17.14.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:40 -0700 Message-Id: <1314144835-29098-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1314144835-29098-1-git-send-email-rth@twiddle.net> References: <1314144835-29098-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 01/16] fixup: merge with last sm501 patch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- 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);