diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-26 10:49:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-26 10:49:12 -0500 |
| commit | e2d6e64bc3a3949f148476de656e515feffc1d22 (patch) | |
| tree | d983b0c067cdb4357ffeea5cfe6ce9f7547bffa8 /net | |
| parent | 72a231b7a7c801d413fb3aacaff04af6457a59b7 (diff) | |
| parent | 216bf2f490c214b8a0702b52cc957138ba24bc3f (diff) | |
Merge tag 'linux-can-next-for-4.16-20180126' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2018-01-26
this is a pull request for net-next/master consisting of 3 patches.
The first two patches target the CAN documentation. The first is by me
and fixes pointer to location of fsl,mpc5200-mscan node in the mpc5200
documentation. The second patch is by Robert Schwebel and it converts
the plain ASCII documentation to restructured text.
The third patch is by Fabrizio Castro add the r8a774[35] support to the
rcar_can dt-bindings documentation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/Kconfig b/net/can/Kconfig index a15c0e0d1fc7..a4399be54ff4 100644 --- a/net/can/Kconfig +++ b/net/can/Kconfig @@ -11,7 +11,7 @@ menuconfig CAN 1991, mainly for automotive, but now widely used in marine (NMEA2000), industrial, and medical applications. More information on the CAN network protocol family PF_CAN - is contained in <Documentation/networking/can.txt>. + is contained in <Documentation/networking/can.rst>. If you want CAN support you should say Y here and also to the specific driver for your controller(s) below. |