From patchwork Mon May 30 22:44:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 831062 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4UMl9xS010904 for ; Mon, 30 May 2011 22:47:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756731Ab1E3WrI (ORCPT ); Mon, 30 May 2011 18:47:08 -0400 Received: from d1.icnet.pl ([212.160.220.21]:47802 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755545Ab1E3WrH (ORCPT ); Mon, 30 May 2011 18:47:07 -0400 Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.localnet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1QRBEo-0008Lm-D7; Tue, 31 May 2011 00:47:06 +0200 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: "Russell King - ARM Linux" Subject: [PATCH 3.0-rc1 v2] OMAP: fix compilation error Date: Tue, 31 May 2011 00:44:31 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-gentoo-r5; KDE/4.4.5; i686; ; ) Cc: "linux-omap@vger.kernel.org" , Tony Lindgren , linux-arm-kernel@lists.infradead.org References: <201105302344.01530.jkrzyszt@tis.icnet.pl> <20110530222107.GA21753@n2100.arm.linux.org.uk> In-Reply-To: <20110530222107.GA21753@n2100.arm.linux.org.uk> MIME-Version: 1.0 Message-Id: <201105310044.31746.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 30 May 2011 22:47:09 +0000 (UTC) Forward-declare platform_device structure in arch/arm/plat-omap/include/plat/flash.h, otherwise compilation may break with: In file included from arch/arm/mach-omap1/flash.c:15: arch/arm/plat-omap/include/plat/flash.h:14: warning: 'struct platform_device' declared inside parameter list arch/arm/plat-omap/include/plat/flash.h:14: warning: its scope is only this definition or declaration, which is probably not what you want arch/arm/mach-omap1/flash.c:16: warning: 'struct platform_device' declared inside parameter list arch/arm/mach-omap1/flash.c:17: error: conflicting types for 'omap1_set_vpp' arch/arm/plat-omap/include/plat/flash.h:14: error: previous declaration of 'omap1_set_vpp' was here Detected and corrected while building for Amstrad Delta, confirmed with omap1_defconfig. Signed-off-by: Janusz Krzysztofik --- v1 -> v2 change requested by Russell King (thanks!): - no need to add to the complexities of header file inclusion arch/arm/plat-omap/include/plat/flash.h | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- git/arch/arm/plat-omap/include/plat/flash.h.orig 2011-05-31 00:29:36.000000000 +0200 +++ git/arch/arm/plat-omap/include/plat/flash.h 2011-05-31 00:30:50.000000000 +0200 @@ -11,6 +11,7 @@ #include +struct platform_device; extern void omap1_set_vpp(struct platform_device *pdev, int enable); #endif