diff --git a/[refs] b/[refs] index f24429edcfb2..68f93b76ba50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5d3557103f8bef81d7a150ab9cc970099cd58a2 +refs/heads/master: 10ccff62bd3de7a64cf98f4c37ec0414b8affd4f diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 2cc81a54cbf3..5db667c0b371 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -2428,7 +2428,7 @@ config UGETH_TX_ON_DEMAND config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" - depends on MV64X60 || PPC32 || PLAT_ORION + depends on (MV64X60 || PPC32 || PLAT_ORION) && INET select INET_LRO select PHYLIB help @@ -2803,7 +2803,7 @@ config NIU config PASEMI_MAC tristate "PA Semi 1/10Gbit MAC" - depends on PPC_PASEMI && PCI + depends on PPC_PASEMI && PCI && INET select PHYLIB select INET_LRO help