diff --git a/[refs] b/[refs] index 6eb97ccfd59e..1c3d339bf8c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a186d2aead8beb164ddb76245d189c66f7021b59 +refs/heads/master: 952ee9df26c487f2d73b2dced58ec904f19ea0f8 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index b8727d54bdbb..48b73b077156 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1,4 +1,3 @@ - # # Network device configuration # @@ -2351,7 +2350,7 @@ config UGETH_TX_ON_DEMAND config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" - depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION + depends on MV64360 || MV64X60 || PPC32 || PLAT_ORION select INET_LRO select PHYLIB help