diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-04 14:56:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-04 14:56:38 -0400 |
| commit | 21a180cda012e1f93e362dd4a9b0bfd3d8c92940 (patch) | |
| tree | 0e0d10baa3fdcd8ffbc6881076ff1695808dad9d /drivers/net/Kconfig | |
| parent | c7d4426a98a5f6654cd0b4b33d9dab2e77192c18 (diff) | |
| parent | 51e97a12bef19b7e43199fc153cf9bd5f2140362 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/Kconfig
net/ipv4/tcp_timer.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ef683a993dce..13d01f358f34 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2428,7 +2428,7 @@ config UGETH_TX_ON_DEMAND | |||
| 2428 | 2428 | ||
| 2429 | config MV643XX_ETH | 2429 | config MV643XX_ETH |
| 2430 | tristate "Marvell Discovery (643XX) and Orion ethernet support" | 2430 | tristate "Marvell Discovery (643XX) and Orion ethernet support" |
| 2431 | depends on MV64X60 || PPC32 || PLAT_ORION | 2431 | depends on (MV64X60 || PPC32 || PLAT_ORION) && INET |
| 2432 | select INET_LRO | 2432 | select INET_LRO |
| 2433 | select PHYLIB | 2433 | select PHYLIB |
| 2434 | help | 2434 | help |
| @@ -2815,7 +2815,7 @@ config NIU | |||
| 2815 | 2815 | ||
| 2816 | config PASEMI_MAC | 2816 | config PASEMI_MAC |
| 2817 | tristate "PA Semi 1/10Gbit MAC" | 2817 | tristate "PA Semi 1/10Gbit MAC" |
| 2818 | depends on PPC_PASEMI && PCI | 2818 | depends on PPC_PASEMI && PCI && INET |
| 2819 | select PHYLIB | 2819 | select PHYLIB |
| 2820 | select INET_LRO | 2820 | select INET_LRO |
| 2821 | help | 2821 | help |