diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-17 06:58:58 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-17 06:58:59 +0300 |
| commit | 833e24aeb4d9a4803af3b836464df01293ce9041 (patch) | |
| tree | a9bd7f8cb0fbe083d34d651d797d54b7e498c395 /include/linux | |
| parent | e7480a44d7c4ce4691fa6bcdb0318f0d81fe4b12 (diff) | |
| parent | 2a3e16360290642202450dad67847824157cccae (diff) | |
| download | linux-833e24aeb4d9a4803af3b836464df01293ce9041.tar.xz | |
Merge tag 'linux-can-next-for-6.5-20230515' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2023-05-15
The 1st patch is by Ji-Ze Hong and adds support for the Fintek F81604
USB-CAN adapter.
Jiapeng Chong's patch removes unnecessary dev_err() functions from the
bxcan driver.
The next patch is by me an makes a CAN internal header file self
contained.
The remaining 19 patches are by Uwe Kleine-König, they all convert the
platform driver remove callback to return void.
* tag 'linux-can-next-for-6.5-20230515' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (22 commits)
can: xilinx: Convert to platform remove callback returning void
can: ti_hecc: Convert to platform remove callback returning void
can: sun4i_can: Convert to platform remove callback returning void
can: softing: Convert to platform remove callback returning void
can: sja1000_platform: Convert to platform remove callback returning void
can: sja1000_isa: Convert to platform remove callback returning void
can: rcar: Convert to platform remove callback returning void
can: mscan: mpc5xxx_can: Convert to platform remove callback returning void
can: m_can: Convert to platform remove callback returning void
can: janz-ican3: Convert to platform remove callback returning void
can: ifi_canfd: Convert to platform remove callback returning void
can: grcan: Convert to platform remove callback returning void
can: flexcan: Convert to platform remove callback returning void
can: ctucanfd: Convert to platform remove callback returning void
can: length: make header self contained
can: cc770_platform: Convert to platform remove callback returning void
can: bxcan: Remove unnecessary print function dev_err()
can: cc770_isa: Convert to platform remove callback returning void
can: usb: f81604: add Fintek F81604 support
can: c_can: Convert to platform remove callback returning void
...
====================
Link: https://lore.kernel.org/r/20230515205759.1003118-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/can/length.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/can/length.h b/include/linux/can/length.h index 6995092b774e..69336549d24f 100644 --- a/include/linux/can/length.h +++ b/include/linux/can/length.h @@ -6,6 +6,9 @@ #ifndef _CAN_LENGTH_H #define _CAN_LENGTH_H +#include <linux/can.h> +#include <linux/can/netlink.h> + /* * Size of a Classical CAN Standard Frame * |