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/cc770/cc770.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/cc770/cc770.c')
| -rw-r--r-- | drivers/net/can/cc770/cc770.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c index d837927..c486fe5 100644 --- a/drivers/net/can/cc770/cc770.c +++ b/drivers/net/can/cc770/cc770.c @@ -60,7 +60,7 @@ MODULE_DESCRIPTION(KBUILD_MODNAME "CAN netdevice driver"); * * The message objects 1..14 can be used for TX and RX while the message * objects 15 is optimized for RX. It has a shadow register for reliable - * data receiption under heavy bus load. Therefore it makes sense to use + * data reception under heavy bus load. Therefore it makes sense to use * this message object for the needed use case. The frame type (EFF/SFF) * for the message object 15 can be defined via kernel module parameter * "msgobj15_eff". If not equal 0, it will receive 29-bit EFF frames, |