diff options
| author | Colin Cross <ccross@android.com> | 2010-10-15 12:04:05 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-15 12:04:05 -0700 |
| commit | 9ab3d8b9fcc83cb2eab5cc9834b742d437915a2e (patch) | |
| tree | 0a4dc68f031cba95cd36ededfb9b30de60fe1145 /drivers/net/Kconfig | |
| parent | c8b43bb8ec47fc7e75f4474b454d459a22d9f233 (diff) | |
| parent | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
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 e31b62b53d08..be5c811ed9d8 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 |