diff --git a/[refs] b/[refs] index 01718ca51dad..b5b89591be5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74b5127884d76ccbf4f445f650f9e969ccb4a374 +refs/heads/master: 03c49daa8168b58e6256f0cad88771b9440ca5f7 diff --git a/trunk/drivers/net/can/Kconfig b/trunk/drivers/net/can/Kconfig index ab45758c49a4..bb709fd66993 100644 --- a/trunk/drivers/net/can/Kconfig +++ b/trunk/drivers/net/can/Kconfig @@ -103,11 +103,11 @@ config CAN_FLEXCAN Say Y here if you want to support for Freescale FlexCAN. config PCH_CAN - tristate "PCH CAN" + tristate "Intel EG20T PCH CAN controller" depends on CAN_DEV && PCI ---help--- - This driver is for PCH CAN of Topcliff which is an IOH for x86 - embedded processor. + This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which + is an IOH for x86 embedded processor (Intel Atom E6xx series). This driver can access CAN bus. source "drivers/net/can/mscan/Kconfig"