Merge android-4.4.186 (aeb051d) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / can / spi / Kconfig

diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig
index 249d2db..618ec96 100644 (file)
--- a/drivers/net/can/spi/Kconfig
+++ b/drivers/net/can/spi/Kconfig
@@ -8,4 +8,21 @@ config CAN_MCP251X
          Driver for the Microchip MCP251x and MCP25625 SPI CAN
          controllers.
 
+config CAN_RH850
+       tristate "Renesas RH850 SPI CAN controller"
+       depends on HAS_DMA
+       ---help---
+         Driver for the Renesas RH850 SPI CAN controller.
+
+config CAN_K61
+       tristate "Freescale K61 SPI CAN controllers"
+       depends on SPI
+       ---help---
+         Driver for the Freescale K61 SPI CAN controllers.
+
+config QTI_CAN
+       tristate "Unified driver for QTI CAN controllers"
+       depends on SPI
+       ---help---
+         Unified driver for QTI CAN controllers.
 endmenu