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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/can/core.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h index 7da9f1f82e8e..5fb8d0e3f9c1 100644 --- a/include/linux/can/core.h +++ b/include/linux/can/core.h @@ -18,13 +18,6 @@ #include <linux/skbuff.h> #include <linux/netdevice.h> -#define CAN_VERSION "20170425" - -/* increment this number each time you change some user-space interface */ -#define CAN_ABI_VERSION "9" - -#define CAN_VERSION_STRING "rev " CAN_VERSION " abi " CAN_ABI_VERSION - #define DNAME(dev) ((dev) ? (dev)->name : "any") /** |