diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-25 21:10:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-25 21:10:12 -0500 |
| commit | e74b3f7d568a62d21a76885438d7351948e7355a (patch) | |
| tree | e9a25a16392ec2d3933de938f68331e072baeb9a /drivers/net/arm/Kconfig | |
| parent | 13e620e0e6c609ccc9882ea280f4f077500d51a0 (diff) | |
| parent | 59f8500efb05096484a55263109acab6a6df89d5 (diff) | |
Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
Diffstat (limited to 'drivers/net/arm/Kconfig')
| -rw-r--r-- | drivers/net/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index abe17762e6f5..2895db13bfa4 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig | |||
| @@ -59,7 +59,7 @@ config EP93XX_ETH | |||
| 59 | config IXP4XX_ETH | 59 | config IXP4XX_ETH |
| 60 | tristate "Intel IXP4xx Ethernet support" | 60 | tristate "Intel IXP4xx Ethernet support" |
| 61 | depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR | 61 | depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR |
| 62 | select MII | 62 | select PHYLIB |
| 63 | help | 63 | help |
| 64 | Say Y here if you want to use built-in Ethernet ports | 64 | Say Y here if you want to use built-in Ethernet ports |
| 65 | on IXP4xx processor. | 65 | on IXP4xx processor. |