diff --git a/[refs] b/[refs] index 627da7bd7e54..b9ac3e39534a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ac377462938e8ec0a521dba17b2a81b502d8d19 +refs/heads/master: 19de1e389bddb89c4cc1e4d29bb99194b50cb487 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 8c13df7fdc16..ebe68395ecf8 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1751,7 +1751,7 @@ config TLAN config KS8842 tristate "Micrel KSZ8841/42 with generic bus interface" - depends on HAS_IOMEM + depends on HAS_IOMEM && DMA_ENGINE help This platform driver is for KSZ8841(1-port) / KS8842(2-port) ethernet switch chip (managed, VLAN, QoS) from Micrel or