diff --git a/[refs] b/[refs] index 51c9cd1da727..3f775fcb35ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2149f66f49ab07515666127bf5140c5c94677af8 +refs/heads/master: c189308bd8b6a29b11c3ec29a42a3f0aabad6bc8 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 7a90e7ce5a9c..5ce7cbabd7a7 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1727,7 +1727,8 @@ config KS8842 tristate "Micrel KSZ8842" depends on HAS_IOMEM help - This platform driver is for Micrel KSZ8842 chip. + This platform driver is for Micrel KSZ8842 / KS8842 + 2-port ethernet switch chip (managed, VLAN, QoS). config KS8851 tristate "Micrel KS8851 SPI"