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 /drivers/net/can/vcan.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 'drivers/net/can/vcan.c')
-rw-r--r-- | drivers/net/can/vcan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c index 4e94057..674f367 100644 --- a/drivers/net/can/vcan.c +++ b/drivers/net/can/vcan.c @@ -50,9 +50,6 @@ #include <linux/slab.h> #include <net/rtnetlink.h> -static __initconst const char banner[] = - KERN_INFO "vcan: Virtual CAN interface driver\n"; - MODULE_DESCRIPTION("virtual CAN interface"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>"); @@ -173,7 +170,7 @@ static struct rtnl_link_ops vcan_link_ops __read_mostly = { static __init int vcan_init_module(void) { - printk(banner); + pr_info("vcan: Virtual CAN interface driver\n"); if (echo) printk(KERN_INFO "vcan: enabled echo on driver level.\n"); |