From patchwork Wed Aug 24 10:17:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 1091792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7OAJ7ku011833 for ; Wed, 24 Aug 2011 10:19:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756583Ab1HXKTG (ORCPT ); Wed, 24 Aug 2011 06:19:06 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:58821 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755946Ab1HXKTF (ORCPT ); Wed, 24 Aug 2011 06:19:05 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id p7OAIvaC009707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 24 Aug 2011 05:18:57 -0500 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7OAIvvn028870; Wed, 24 Aug 2011 05:18:57 -0500 (CDT) Received: from DFLE70.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7OAIvwP025285; Wed, 24 Aug 2011 05:18:57 -0500 (CDT) Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle70.ent.ti.com (128.247.5.40) with Microsoft SMTP Server id 14.1.323.3; Wed, 24 Aug 2011 05:18:57 -0500 Received: from localhost.localdomain (lncpu04.tif.ti.com [137.167.102.15]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7OAI7NE021410; Wed, 24 Aug 2011 05:18:55 -0500 From: Benoit Cousson To: CC: , , , , , Benoit Cousson Subject: [RFC PATCH 1/7] OMAP3+: boards: Fix the __initconst build error Date: Wed, 24 Aug 2011 12:17:14 +0200 Message-ID: <1314181040-22807-2-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1314181040-22807-1-git-send-email-b-cousson@ti.com> References: <1314181040-22807-1-git-send-email-b-cousson@ti.com> MIME-Version: 1.0 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 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Aug 2011 10:19:07 +0000 (UTC) The __initconst introduced some build errors with the following compiler version: arm-none-linux-gnueabi-gcc (Sourcery G++ Lite 2010.09-50) 4.5.1 arch/arm/mach-omap2/board-omap3beagle.c:566:20: error: omap3_beagle_dt_match causes a section type conflict Replace them by __initdata. Signed-off-by: Benoit Cousson --- arch/arm/mach-omap2/board-igep0020.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap4panda.c | 2 +- arch/arm/mach-omap2/board-overo.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 249165a..2521823 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -671,7 +671,7 @@ static void __init igep_init(void) } } -static const char *igep2_dt_compat[] __initconst = { +static const char *igep2_dt_compat[] __initdata = { "ISEE,igep-v2", NULL }; diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index b3b9cbc..a7923ca 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -563,7 +563,7 @@ static void __init omap3_beagle_init(void) beagle_opp_init(); } -static const char *omap3_beagle_dt_match[] __initconst = { +static const char *omap3_beagle_dt_match[] __initdata = { "ti,omap3-beagle", NULL }; diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index b526aa9..1c583c7 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -581,7 +581,7 @@ static void __init omap4_panda_map_io(void) omap44xx_map_common_io(); } -static const char *omap4_panda_match[] __initconst = { +static const char *omap4_panda_match[] __initdata = { "ti,omap4-panda", NULL, }; diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 18ae2c2..f0b8489 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -560,7 +560,7 @@ static void __init overo_init(void) "OVERO_GPIO_USBH_CPEN\n"); } -static const char *omap3_overo_dt_match[] __initconst = { +static const char *omap3_overo_dt_match[] __initdata = { "gumstix,omap3-overo", NULL };