diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
| commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
| tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /drivers/net/Kconfig | |
| parent | c0f39322c335412339dec16ebfd2a05ceba5ebcf (diff) | |
| parent | 802fb176d8c635ae42da31b80841c26e8c7338a0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 95d1b61342e..da30a31e66f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2555,7 +2555,7 @@ config NIU | |||
| 2555 | 2555 | ||
| 2556 | config PASEMI_MAC | 2556 | config PASEMI_MAC |
| 2557 | tristate "PA Semi 1/10Gbit MAC" | 2557 | tristate "PA Semi 1/10Gbit MAC" |
| 2558 | depends on PPC64 && PCI | 2558 | depends on PPC_PASEMI && PCI |
| 2559 | select PHYLIB | 2559 | select PHYLIB |
| 2560 | select INET_LRO | 2560 | select INET_LRO |
| 2561 | help | 2561 | help |