aboutsummaryrefslogtreecommitdiffstats
path: root/net/can/af_can.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 20:12:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:04:45 -0400
commit6299b669b1340b9f7de2bc2bd565921a1494e7f7 (patch)
treed5b2dccaf8bee86fc88594df60aafd6e2cf65014 /net/can/af_can.c
parent17f3609c21706b377ad80b5251558ed700c2af17 (diff)
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/af_can.c')
-rw-r--r--net/can/af_can.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 821022a7214f..ddac1ee2ed20 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -63,7 +63,7 @@
63 63
64#include "af_can.h" 64#include "af_can.h"
65 65
66static __initdata const char banner[] = KERN_INFO 66static __initconst const char banner[] = KERN_INFO
67 "can: controller area network core (" CAN_VERSION_STRING ")\n"; 67 "can: controller area network core (" CAN_VERSION_STRING ")\n";
68 68
69MODULE_DESCRIPTION("Controller Area Network PF_CAN core"); 69MODULE_DESCRIPTION("Controller Area Network PF_CAN core");