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 | |
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')
-rw-r--r-- | drivers/net/hamradio/6pack.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 6 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index d225a2adf1ee..1450e33fc250 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
@@ -829,7 +829,7 @@ static int __init sixpack_init_driver(void) | |||
829 | return status; | 829 | return status; |
830 | } | 830 | } |
831 | 831 | ||
832 | static const char msg_unregfail[] __exitdata = KERN_ERR \ | 832 | static const char msg_unregfail[] = KERN_ERR \ |
833 | "6pack: can't unregister line discipline (err = %d)\n"; | 833 | "6pack: can't unregister line discipline (err = %d)\n"; |
834 | 834 | ||
835 | static void __exit sixpack_exit_driver(void) | 835 | static void __exit sixpack_exit_driver(void) |
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 76d54774ba82..c2e5497397d5 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -87,7 +87,7 @@ | |||
87 | 87 | ||
88 | #include <linux/bpqether.h> | 88 | #include <linux/bpqether.h> |
89 | 89 | ||
90 | static const char banner[] __initdata = KERN_INFO \ | 90 | static const char banner[] __initconst = KERN_INFO \ |
91 | "AX.25: bpqether driver version 004\n"; | 91 | "AX.25: bpqether driver version 004\n"; |
92 | 92 | ||
93 | static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; | 93 | static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; |
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) |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index efc6c97163a7..1b4a47bd32b7 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -182,7 +182,7 @@ | |||
182 | 182 | ||
183 | #include "z8530.h" | 183 | #include "z8530.h" |
184 | 184 | ||
185 | static const char banner[] __initdata = KERN_INFO \ | 185 | static const char banner[] __initconst = KERN_INFO \ |
186 | "AX.25: Z8530 SCC driver version "VERSION".dl1bke\n"; | 186 | "AX.25: Z8530 SCC driver version "VERSION".dl1bke\n"; |
187 | 187 | ||
188 | static void t_dwait(unsigned long); | 188 | static void t_dwait(unsigned long); |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 5a6412ecce73..c6645f1017af 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -76,7 +76,7 @@ | |||
76 | /* --------------------------------------------------------------------- */ | 76 | /* --------------------------------------------------------------------- */ |
77 | 77 | ||
78 | static const char yam_drvname[] = "yam"; | 78 | static const char yam_drvname[] = "yam"; |
79 | static const char yam_drvinfo[] __initdata = KERN_INFO \ | 79 | static const char yam_drvinfo[] __initconst = KERN_INFO \ |
80 | "YAM driver version 0.8 by F1OAT/F6FBB\n"; | 80 | "YAM driver version 0.8 by F1OAT/F6FBB\n"; |
81 | 81 | ||
82 | /* --------------------------------------------------------------------- */ | 82 | /* --------------------------------------------------------------------- */ |