diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/net/Kconfig | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
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 124d29f5fa0c..0b44daa36f91 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2635,7 +2635,7 @@ config NIU | |||
| 2635 | 2635 | ||
| 2636 | config PASEMI_MAC | 2636 | config PASEMI_MAC |
| 2637 | tristate "PA Semi 1/10Gbit MAC" | 2637 | tristate "PA Semi 1/10Gbit MAC" |
| 2638 | depends on PPC64 && PCI | 2638 | depends on PPC_PASEMI && PCI |
| 2639 | select PHYLIB | 2639 | select PHYLIB |
| 2640 | select INET_LRO | 2640 | select INET_LRO |
| 2641 | help | 2641 | help |