diff --git a/[refs] b/[refs]
index ac3266ca31b8..ffeaa18f2f6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75fdd155eaf755aa183ca9844a9a178b7a0e3959
+refs/heads/master: 6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5
diff --git a/trunk/drivers/atm/eni.c b/trunk/drivers/atm/eni.c
index 2059ee460b0c..81e44f7b0ab6 100644
--- a/trunk/drivers/atm/eni.c
+++ b/trunk/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 */