diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-09 21:49:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 21:49:00 (GMT) |
| commit | 602de7ead5a4c02c2a3fe17b24a67f894cbffaba (patch) | |
| tree | 05c8ff9b2d47d2b7a4d1f70e11fc4e68cc65b036 /net/can/raw.c | |
| parent | 605ad7f184b60cfaacbc038aa6c55ee68dee3c89 (diff) | |
| parent | 71a3aedce6b37318d0e38676681dff179ec42874 (diff) | |
| download | linux-602de7ead5a4c02c2a3fe17b24a67f894cbffaba.tar.xz | |
Merge tag 'linux-can-next-for-3.19-20141207' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-12-07
this is a pull request of 8 patches for net-next/master.
Andri Yngvason contributes 4 patches in which the CAN state change
handling is consolidated and unified among the sja1000, mscan and
flexcan driver. The three patches by Jeremiah Mahler fix spelling
mistakes and eliminate the banner[] variable in various parts. And a
patch by me that switches on sparse endianess checking by default.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index dfdcffb..00c13ef 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -56,8 +56,6 @@ #include <net/net_namespace.h> #define CAN_RAW_VERSION CAN_VERSION -static __initconst const char banner[] = - KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n"; MODULE_DESCRIPTION("PF_CAN raw protocol"); MODULE_LICENSE("Dual BSD/GPL"); @@ -810,7 +808,7 @@ static __init int raw_module_init(void) { int err; - printk(banner); + pr_info("can: raw protocol (rev " CAN_RAW_VERSION ")\n"); err = can_proto_register(&raw_can_proto); if (err < 0) |