summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2010-10-03 15:42:05 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-03 21:46:24 -0700
commit10ccff62bd3de7a64cf98f4c37ec0414b8affd4f (patch)
treee56de76022dd36cc07b16f6a1cd94049fa185f75 /drivers/net/Kconfig
parentc5d3557103f8bef81d7a150ab9cc970099cd58a2 (diff)
downloadblackbird-op-linux-10ccff62bd3de7a64cf98f4c37ec0414b8affd4f.tar.gz
blackbird-op-linux-10ccff62bd3de7a64cf98f4c37ec0414b8affd4f.zip
netdev: Depend on INET before selecting INET_LRO
Since 'select' ignores dependencies, drivers that select INET_LRO must depend on INET. This fixes the broken configuration reported in <http://article.gmane.org/gmane.linux.kernel/825646>. Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2cc81a54cbf3..5db667c0b371 100644
--- a/drivers/net/Kconfig
+++ b/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
OpenPOWER on IntegriCloud