summaryrefslogtreecommitdiffstats
path: root/drivers/net/hamradio
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:42 +0900
commitc477ebd89db4f53b380b6ba70d25e055e0aa2739 (patch)
tree263acb6c824a8c357ef8baecc72f6fc845e5d17a /drivers/net/hamradio
parent6cfe1093ca8ddfc0e50748d370c268aeabf371aa (diff)
downloadlinux-stable-c477ebd89db4f53b380b6ba70d25e055e0aa2739.tar.gz
linux-stable-c477ebd89db4f53b380b6ba70d25e055e0aa2739.tar.bz2
linux-stable-c477ebd89db4f53b380b6ba70d25e055e0aa2739.zip
sections: fix section conflicts in drivers/net
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')
-rw-r--r--drivers/net/hamradio/6pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 64783a0d545a..d225a2adf1ee 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -811,9 +811,9 @@ static struct tty_ldisc_ops sp_ldisc = {
/* Initialize 6pack control device -- register 6pack line discipline */
-static const char msg_banner[] __initdata = KERN_INFO \
+static const char msg_banner[] __initconst = KERN_INFO \
"AX.25: 6pack driver, " SIXPACK_VERSION "\n";
-static const char msg_regfail[] __initdata = KERN_ERR \
+static const char msg_regfail[] __initconst = KERN_ERR \
"6pack: can't register line discipline (err = %d)\n";
static int __init sixpack_init_driver(void)