From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri, 30 Mar 2012 20:04:56 +0000 (+0200)
Subject: mfd: Mark const init data with __initconst instead of __initdata for ab5500
X-Git-Tag: next-20120417~31^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ea969f0d79da44309e0c4ae156058cab5ec5301;p=karo-tx-linux.git

mfd: Mark const init data with __initconst instead of __initdata for ab5500

As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with

	error: $variablename causes a section type conflict

because a section containing const variables is marked read only and so
cannot contain non-const variables.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c
index 54d0fe40845f..3765c769df19 100644
--- a/drivers/mfd/ab5500-core.c
+++ b/drivers/mfd/ab5500-core.c
@@ -1291,7 +1291,7 @@ struct ab_family_id {
 	char	*name;
 };
 
-static const struct ab_family_id ids[] __initdata = {
+static const struct ab_family_id ids[] __initconst = {
 	/* AB5500 */
 	{
 		.id = AB5500_1_0,