diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:11:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:40 +0900 |
| commit | 6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5 (patch) | |
| tree | 97775abaf636305d670c266245c5bcbd5700067c /drivers/atm/eni.c | |
| parent | 75fdd155eaf755aa183ca9844a9a178b7a0e3959 (diff) | |
| download | op-kernel-dev-6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5.zip op-kernel-dev-6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5.tar.gz | |
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 2059ee4..81e44f7 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 */ |
