mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
75fdd155ea
commit
6ca3b14a9b
@ -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 */
|
||||||
|
Loading…
Reference in New Issue
Block a user