diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:43 -0400 |
commit | afa8c78b889262a1c809a1c1ed17619015ad0481 (patch) | |
tree | 8792e3d4961443c11f38f2b110cd12ad59904362 /drivers/net/hamradio/mkiss.c | |
parent | c477ebd89db4f53b380b6ba70d25e055e0aa2739 (diff) |
sections: fix section conflicts in drivers/net/hamradio
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/hamradio/mkiss.c')
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 2c0894a92abd..8e01c457015b 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -997,9 +997,9 @@ static struct tty_ldisc_ops ax_ldisc = { | |||
997 | .write_wakeup = mkiss_write_wakeup | 997 | .write_wakeup = mkiss_write_wakeup |
998 | }; | 998 | }; |
999 | 999 | ||
1000 | static const char banner[] __initdata = KERN_INFO \ | 1000 | static const char banner[] __initconst = KERN_INFO \ |
1001 | "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n"; | 1001 | "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n"; |
1002 | static const char msg_regfail[] __initdata = KERN_ERR \ | 1002 | static const char msg_regfail[] __initconst = KERN_ERR \ |
1003 | "mkiss: can't register line discipline (err = %d)\n"; | 1003 | "mkiss: can't register line discipline (err = %d)\n"; |
1004 | 1004 | ||
1005 | static int __init mkiss_init_driver(void) | 1005 | static int __init mkiss_init_driver(void) |
@@ -1015,7 +1015,7 @@ static int __init mkiss_init_driver(void) | |||
1015 | return status; | 1015 | return status; |
1016 | } | 1016 | } |
1017 | 1017 | ||
1018 | static const char msg_unregfail[] __exitdata = KERN_ERR \ | 1018 | static const char msg_unregfail[] = KERN_ERR \ |
1019 | "mkiss: can't unregister line discipline (err = %d)\n"; | 1019 | "mkiss: can't unregister line discipline (err = %d)\n"; |
1020 | 1020 | ||
1021 | static void __exit mkiss_exit_driver(void) | 1021 | static void __exit mkiss_exit_driver(void) |