diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-12 09:53:08 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-12 09:53:08 -0700 |
| commit | 2ad119d998e49003327b81edb7b854d0983b5d58 (patch) | |
| tree | dc3bc0dce080d44536566ad7ee0984a1fad496fa /net/can/raw.c | |
| parent | 15f5e48f93c0e028b4d5cc0e8ede1168a2308fe6 (diff) | |
| parent | f726f3d37163f714034aa5fd1f92a1a73df4297f (diff) | |
Merge tag 'linux-can-next-for-5.10-20201012' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
linux-can-next-for-5.10-20201012
Both patches are by Oliver Hartkopp, the first one addresses Jakub's review
comments of the ISOTP protocol, the other one removes version strings from
various CAN protocols.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 ea70850f9152..6ec8aa1d0da4 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -55,8 +55,6 @@ #include <net/sock.h> #include <net/net_namespace.h> -#define CAN_RAW_VERSION CAN_VERSION - MODULE_DESCRIPTION("PF_CAN raw protocol"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>"); @@ -885,7 +883,7 @@ static __init int raw_module_init(void) { int err; - pr_info("can: raw protocol (rev " CAN_RAW_VERSION ")\n"); + pr_info("can: raw protocol\n"); err = can_proto_register(&raw_can_proto); if (err < 0) |