summaryrefslogtreecommitdiffstats
path: root/net/can/raw.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:12:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:45 +0900
commit6299b669b1340b9f7de2bc2bd565921a1494e7f7 (patch)
treed5b2dccaf8bee86fc88594df60aafd6e2cf65014 /net/can/raw.c
parent17f3609c21706b377ad80b5251558ed700c2af17 (diff)
downloadlinux-6299b669b1340b9f7de2bc2bd565921a1494e7f7.tar.gz
linux-6299b669b1340b9f7de2bc2bd565921a1494e7f7.tar.bz2
linux-6299b669b1340b9f7de2bc2bd565921a1494e7f7.zip
sections: fix section conflicts in net/can
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Oliver Hartkopp <socketcan@hartkopp.net> 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 'net/can/raw.c')
-rw-r--r--net/can/raw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index 3e9c89356a93..5b0e3e330d97 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -55,7 +55,7 @@
#include <net/net_namespace.h>
#define CAN_RAW_VERSION CAN_VERSION
-static __initdata const char banner[] =
+static __initconst const char banner[] =
KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
MODULE_DESCRIPTION("PF_CAN raw protocol");