UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andi Kleen 2012-10-04 17:11:58 -07:00 committed by Linus Torvalds
parent c477ebd89d
commit afa8c78b88
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/hamradio/6pack.c
View File

@ -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)

2
drivers/net/hamradio/bpqether.c
View File

@ -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};

6
drivers/net/hamradio/mkiss.c
View File

@ -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)

2
drivers/net/hamradio/scc.c
View File

@ -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);

2
drivers/net/hamradio/yam.c
View File

@ -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";
/* --------------------------------------------------------------------- */