Commit 6ca3b14a authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in drivers/atm 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 75fdd155

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */