summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2012-03-29 23:12:32 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-05-13 22:47:12 -0500
commit6d56b9d65813dd6a184efc5e7955d7e181a853c0 (patch)
treea715bae20e4f34c525c114b631d5aaa2e7fec034 /drivers/mtd/maps
parentce4bbeeddb1dfc710554cc69fc21599311975077 (diff)
downloadop-kernel-dev-6d56b9d65813dd6a184efc5e7955d7e181a853c0.zip
op-kernel-dev-6d56b9d65813dd6a184efc5e7955d7e181a853c0.tar.gz
mtd: mark const init data with __initconst instead of __initdata
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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/wr_sbc82xx_flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c
index 71b0ba7..e7534c8 100644
--- a/drivers/mtd/maps/wr_sbc82xx_flash.c
+++ b/drivers/mtd/maps/wr_sbc82xx_flash.c
@@ -59,7 +59,7 @@ static struct mtd_partition bigflash_parts[] = {
}
};
-static const char *part_probes[] __initdata = {"cmdlinepart", "RedBoot", NULL};
+static const char *part_probes[] __initconst = {"cmdlinepart", "RedBoot", NULL};
#define init_sbc82xx_one_flash(map, br, or) \
do { \
OpenPOWER on IntegriCloud