diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-21 01:58:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-21 01:58:30 -0400 |
| commit | d8d33c3b8a42fbd9ad23a61498fa5db1d83644e0 (patch) | |
| tree | 049910220a628f04c031ce11fcfd7365e4b23c35 /drivers/net/can/c_can/Kconfig | |
| parent | d050de607f062233cf5e75b2e8f40f20c4b04b91 (diff) | |
| parent | 524369e2391f4b422d0efdd11d526a373a11a43a (diff) | |
| download | op-kernel-dev-d8d33c3b8a42fbd9ad23a61498fa5db1d83644e0.zip op-kernel-dev-d8d33c3b8a42fbd9ad23a61498fa5db1d83644e0.tar.gz | |
Merge tag 'linux-can-fixes-for-3.15-20140519' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2014-05-19
this is a pull request for net/master, for the v3.15 release cycle,
with a single patch.
Oliver Hartkopp's patch removes a Kconfig option in the c_can driver,
which was added as a workaround during the v3.15 development. With all
cleanup patches this workaround is not needed anymore.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/c_can/Kconfig')
| -rw-r--r-- | drivers/net/can/c_can/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig index 8ab7103..61ffc12 100644 --- a/drivers/net/can/c_can/Kconfig +++ b/drivers/net/can/c_can/Kconfig @@ -14,13 +14,6 @@ config CAN_C_CAN_PLATFORM SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com) boards like am335x, dm814x, dm813x and dm811x. -config CAN_C_CAN_STRICT_FRAME_ORDERING - bool "Force a strict RX CAN frame order (may cause frame loss)" - ---help--- - The RX split buffer prevents packet reordering but can cause packet - loss. Only enable this option when you accept to lose CAN frames - in favour of getting the received CAN frames in the correct order. - config CAN_C_CAN_PCI tristate "Generic PCI Bus based C_CAN/D_CAN driver" depends on PCI |
