summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:40 +0900
commit6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5 (patch)
tree97775abaf636305d670c266245c5bcbd5700067c /drivers/atm
parent75fdd155eaf755aa183ca9844a9a178b7a0e3959 (diff)
downloadblackbird-op-linux-6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5.tar.gz
blackbird-op-linux-6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5.zip
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')
-rw-r--r--drivers/atm/eni.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 2059ee460b0c..81e44f7b0ab6 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -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 */
OpenPOWER on IntegriCloud