[ARM] Merge AT91 and devel branches

[linux-2.6] / net / ax25 / ax25_addr.c

diff --git a/net/ax25/ax25_addr.c b/net/ax25/ax25_addr.c
index 21a0616152fc4d56b72ded295163eeb93c02a3dd..97a49c79c6050df6caf43543caaff4d8bd07b3fc 100644 (file)
--- a/net/ax25/ax25_addr.c
+++ b/net/ax25/ax25_addr.c
@@ -83,7 +83,7 @@ EXPORT_SYMBOL(ax2asc);
  */
 void asc2ax(ax25_address *addr, const char *callsign)
 {
-       char *s;
+       const char *s;
        int n;
 
        for (s = callsign, n = 0; n < 6; n++) {