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 e6b3862..618ec96 100644 (file)
--- a/drivers/net/can/spi/Kconfig
+++ b/drivers/net/can/spi/Kconfig
@@ -2,10 +2,11 @@ menu "CAN SPI interfaces"
        depends on SPI
 
 config CAN_MCP251X
-       tristate "Microchip MCP251x SPI CAN controllers"
+       tristate "Microchip MCP251x and MCP25625 SPI CAN controllers"
        depends on HAS_DMA
        ---help---
-         Driver for the Microchip MCP251x SPI CAN controllers.
+         Driver for the Microchip MCP251x and MCP25625 SPI CAN
+         controllers.
 
 config CAN_RH850
        tristate "Renesas RH850 SPI CAN controller"