sugar/linux
1
0
Fork 0
Code Activity

sections: fix section conflicts in drivers/atm

Browse Source 
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andi Kleen
2012-10-04 17:11:45 -07:00
committed by Linus Torvalds
parent 75fdd155ea
commit 6ca3b14a9b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/atm/eni.c
View File

@@ -1567,7 +1567,7 @@ tx_complete++;
/*--------------------------------- entries ---------------------------------*/ /*--------------------------------- entries ---------------------------------*/
static const char *media_name[] __devinitdata = { static char * const media_name[] __devinitconst = {
"MMF", "SMF", "MMF", "03?", /* 0- 3 */ "MMF", "SMF", "MMF", "03?", /* 0- 3 */
"UTP", "05?", "06?", "07?", /* 4- 7 */ "UTP", "05?", "06?", "07?", /* 4- 7 */
"TAXI","09?", "10?", "11?", /* 8-11 */ "TAXI","09?", "10?", "11?", /* 8-11 */