diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:40 -0400 |
| commit | 6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5 (patch) | |
| tree | 97775abaf636305d670c266245c5bcbd5700067c /drivers/atm/eni.c | |
| parent | 75fdd155eaf755aa183ca9844a9a178b7a0e3959 (diff) | |
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>
Diffstat (limited to 'drivers/atm/eni.c')
| -rw-r--r-- | drivers/atm/eni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 2059ee460b0..81e44f7b0ab 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
| @@ -1567,7 +1567,7 @@ tx_complete++; | |||
| 1567 | /*--------------------------------- entries ---------------------------------*/ | 1567 | /*--------------------------------- entries ---------------------------------*/ |
| 1568 | 1568 | ||
| 1569 | 1569 | ||
| 1570 | static const char *media_name[] __devinitdata = { | 1570 | static char * const media_name[] __devinitconst = { |
| 1571 | "MMF", "SMF", "MMF", "03?", /* 0- 3 */ | 1571 | "MMF", "SMF", "MMF", "03?", /* 0- 3 */ |
| 1572 | "UTP", "05?", "06?", "07?", /* 4- 7 */ | 1572 | "UTP", "05?", "06?", "07?", /* 4- 7 */ |
| 1573 | "TAXI","09?", "10?", "11?", /* 8-11 */ | 1573 | "TAXI","09?", "10?", "11?", /* 8-11 */ |