From: Andi Kleen <ak@linux.intel.com>
Date: Wed, 26 Sep 2012 01:34:05 +0000 (+1000)
Subject: sections: fix section conflicts in drivers/atm
X-Git-Tag: next-20120927~1^2~180
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d1f2184cd9fb2c5580c93c0fd0d90c5bda51200;p=karo-tx-linux.git

sections: fix section conflicts in drivers/atm

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 2059ee460b0c..81e44f7b0ab6 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1567,7 +1567,7 @@ tx_complete++;
 /*--------------------------------- entries ---------------------------------*/
 
 
-static const char *media_name[] __devinitdata = {
+static char * const media_name[] __devinitconst = {
     "MMF", "SMF", "MMF", "03?", /*  0- 3 */
     "UTP", "05?", "06?", "07?", /*  4- 7 */
     "TAXI","09?", "10?", "11?", /*  8-11 */