diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 18:35:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 18:35:17 -0800 |
| commit | 4259cb25d436a79bf6b07d8075423573567c211d (patch) | |
| tree | 05ae68a795315f4244036358df4c8e0f1034867d /net/ax25/ax25_addr.c | |
| parent | cd39301a68f9604854f3543117b01dc73cbe193f (diff) | |
| parent | a49f99ffca57a2eada23b1ac908a405c17859e35 (diff) | |
| download | linux-4259cb25d436a79bf6b07d8075423573567c211d.tar.gz linux-4259cb25d436a79bf6b07d8075423573567c211d.tar.bz2 linux-4259cb25d436a79bf6b07d8075423573567c211d.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
[NETPOLL]: Fix local_bh_enable() warning.
[IPVS]: Make ip_vs_sync.c <= 80col wide.
[IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()
[HAMRADIO]: Fix baycom_epp.c compile failure.
[DCCP]: Whitespace cleanups
[DCCP] ccid3: Fixup some type conversions related to rtts
[DCCP] ccid3: BUG-FIX - conversion errors
[DCCP] ccid3: Reorder packet history source file
[DCCP] ccid3: Reorder packet history header file
[DCCP] ccid3: Make debug output consistent
[DCCP] ccid3: Perform history operations only after packet has been sent
[DCCP] ccid3: TX history - remove unused field
[DCCP] ccid3: Shift window counter computation
[DCCP] ccid3: Sanity-check RTT samples
[DCCP] ccid3: Initialise RTT values
[DCCP] ccid: Deprecate ccid_hc_tx_insert_options
[DCCP]: Warn when discarding packet due to internal errors
[DCCP]: Only deliver to the CCID rx side in charge
[DCCP]: Simplify TFRC calculation
[DCCP]: Debug timeval operations
...
Diffstat (limited to 'net/ax25/ax25_addr.c')
| -rw-r--r-- | net/ax25/ax25_addr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/ax25_addr.c b/net/ax25/ax25_addr.c index 21a0616152fc..97a49c79c605 100644 --- 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++) { |