]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
sections: fix section conflicts in drivers/atm
authorAndi Kleen <ak@linux.intel.com>
Fri, 28 Sep 2012 00:20:04 +0000 (10:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 06:50:35 +0000 (16:50 +1000)
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>
drivers/atm/eni.c

index 2059ee460b0c61cf48614283db428ff5675f5904..81e44f7b0ab6669b4e88bc28cac5402f2856452f 100644 (file)
@@ -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 */