From patchwork Mon May 30 21:44:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 831012 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 p4UMPj9Z004406 for ; Mon, 30 May 2011 22:25:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755545Ab1E3WZo (ORCPT ); Mon, 30 May 2011 18:25:44 -0400 Received: from d1.icnet.pl ([212.160.220.21]:45121 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753061Ab1E3WZn (ORCPT ); Mon, 30 May 2011 18:25:43 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 30 May 2011 22:25:45 +0000 (UTC) X-Greylist: delayed 2469 seconds by postgrey-1.27 at vger.kernel.org; Mon, 30 May 2011 18:25:43 EDT 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 1QRAIe-0005Qb-12; Mon, 30 May 2011 23:47:00 +0200 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: "linux-omap@vger.kernel.org" Subject: [PATCH 3.0-rc1] OMAP: fix compilation error Date: Mon, 30 May 2011 23:44:01 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-gentoo-r5; KDE/4.4.5; i686; ; ) Cc: Tony Lindgren , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Message-Id: <201105302344.01530.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 Include from 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 --- 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-30 22:15:54.000000000 +0200 +++ git/arch/arm/plat-omap/include/plat/flash.h 2011-05-30 22:38:15.000000000 +0200 @@ -10,6 +10,7 @@ #define __OMAP_FLASH_H #include +#include extern void omap1_set_vpp(struct platform_device *pdev, int enable);