From patchwork Fri Jan 28 22:04:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 515961 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0SLvL0b002883 for ; Fri, 28 Jan 2011 21:58:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751731Ab1A1V6d (ORCPT ); Fri, 28 Jan 2011 16:58:33 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:61377 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751592Ab1A1V6d (ORCPT ); Fri, 28 Jan 2011 16:58:33 -0500 Received: by gyb11 with SMTP id 11so1244504gyb.19 for ; Fri, 28 Jan 2011 13:58:32 -0800 (PST) Received: by 10.150.50.10 with SMTP id x10mr4791752ybx.219.1296251912031; Fri, 28 Jan 2011 13:58:32 -0800 (PST) Received: from chimagu (w142187.ppp.asahi-net.or.jp [121.1.142.187]) by mx.google.com with ESMTPS id v6sm372853ybk.8.2011.01.28.13.58.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 28 Jan 2011 13:58:31 -0800 (PST) Received: from iwamatsu by chimagu with local (Exim 4.72) (envelope-from ) id 1PiwQF-0006b6-Re; Sat, 29 Jan 2011 07:04:03 +0900 From: Nobuhiro Iwamatsu To: linux-sh@vger.kernel.org Cc: Nobuhiro Iwamatsu Subject: [PATCH] sh: sh7750: Fix incompatible pointer type Date: Sat, 29 Jan 2011 07:04:01 +0900 Message-Id: <1296252241-25330-1-git-send-email-iwamatsu@nigauri.org> X-Mailer: git-send-email 1.7.2.3 MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 28 Jan 2011 21:58:34 +0000 (UTC) diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 84230e9..e53b4b3 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c @@ -255,12 +255,17 @@ static struct platform_device *sh7750_early_devices[] __initdata = { void __init plat_early_device_setup(void) { + struct platform_device *dev[1]; + if (mach_is_rts7751r2d()) { scif_platform_data.scscr |= SCSCR_CKE1; - early_platform_add_devices(&scif_device, 1); + dev[0] = &scif_device; + early_platform_add_devices(dev, 1); } else { - early_platform_add_devices(&sci_device, 1); - early_platform_add_devices(&scif_device, 1); + dev[0] = &sci_device; + early_platform_add_devices(dev, 1); + dev[0] = &scif_device; + early_platform_add_devices(dev, 1); } early_platform_add_devices(sh7750_early_devices,