提交 afa8c78b 编写于 作者: A Andi Kleen 提交者: Linus Torvalds

sections: fix section conflicts in drivers/net/hamradio

Signed-off-by: NAndi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 c477ebd8
......@@ -829,7 +829,7 @@ static int __init sixpack_init_driver(void)
return status;
}
static const char msg_unregfail[] __exitdata = KERN_ERR \
static const char msg_unregfail[] = KERN_ERR \
"6pack: can't unregister line discipline (err = %d)\n";
static void __exit sixpack_exit_driver(void)
......
......@@ -87,7 +87,7 @@
#include <linux/bpqether.h>
static const char banner[] __initdata = KERN_INFO \
static const char banner[] __initconst = KERN_INFO \
"AX.25: bpqether driver version 004\n";
static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
......
......@@ -997,9 +997,9 @@ static struct tty_ldisc_ops ax_ldisc = {
.write_wakeup = mkiss_write_wakeup
};
static const char banner[] __initdata = KERN_INFO \
static const char banner[] __initconst = KERN_INFO \
"mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n";
static const char msg_regfail[] __initdata = KERN_ERR \
static const char msg_regfail[] __initconst = KERN_ERR \
"mkiss: can't register line discipline (err = %d)\n";
static int __init mkiss_init_driver(void)
......@@ -1015,7 +1015,7 @@ static int __init mkiss_init_driver(void)
return status;
}
static const char msg_unregfail[] __exitdata = KERN_ERR \
static const char msg_unregfail[] = KERN_ERR \
"mkiss: can't unregister line discipline (err = %d)\n";
static void __exit mkiss_exit_driver(void)
......
......@@ -182,7 +182,7 @@
#include "z8530.h"
static const char banner[] __initdata = KERN_INFO \
static const char banner[] __initconst = KERN_INFO \
"AX.25: Z8530 SCC driver version "VERSION".dl1bke\n";
static void t_dwait(unsigned long);
......
......@@ -76,7 +76,7 @@
/* --------------------------------------------------------------------- */
static const char yam_drvname[] = "yam";
static const char yam_drvinfo[] __initdata = KERN_INFO \
static const char yam_drvinfo[] __initconst = KERN_INFO \
"YAM driver version 0.8 by F1OAT/F6FBB\n";
/* --------------------------------------------------------------------- */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册