diff options
author | David S. Miller <davem@davemloft.net> | 2014-01-31 04:48:17 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-31 04:48:17 +0400 |
commit | 65b80cae7a72e94df9335552e1a77a3a8946566c (patch) | |
tree | 28617224603f1e162a2cb6014c1dd3cc027c251a /drivers/net/can/Kconfig | |
parent | 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 (diff) | |
parent | 73615c8669ef1c497c942cae0d5079b95824332a (diff) | |
download | linux-65b80cae7a72e94df9335552e1a77a3a8946566c.tar.xz |
Merge tag 'linux-can-fixes-for-3.14-20140129' of git://gitorious.org/linux-can/linux-can
linux-can-fixes-for-3.14-20140129
Marc Kleine-Budde says:
====================
Arnd Bergmann provides a fix for the flexcan driver, enabling compilation on
all combinations of big and little endian on ARM and PowerPc. A patch by Ira W.
Snyder fixes uninitialized variable warnings in the janz-ican3 driver.
Rostislav Lisovy contributes a patch to propagate the SO_PRIORITY of raw
sockets to skbs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/Kconfig')
-rw-r--r-- | drivers/net/can/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index d447b881bbde..9e7d95dae2c7 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3 config CAN_FLEXCAN tristate "Support for Freescale FLEXCAN based chips" - depends on (ARM && CPU_LITTLE_ENDIAN) || PPC + depends on ARM || PPC ---help--- Say Y here if you want to support for Freescale FlexCAN. |