diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-04 21:35:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-04 21:35:43 -0500 |
| commit | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (patch) | |
| tree | c08e1c0357fde481a16489b77feb8f6073faf538 /drivers/net/ethernet/freescale/Kconfig | |
| parent | 1d5783030a14d1b6ee763f63c8136e581f48b365 (diff) | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/freescale/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/freescale/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig index 820de8b9ff08..3574e1499dfc 100644 --- a/drivers/net/ethernet/freescale/Kconfig +++ b/drivers/net/ethernet/freescale/Kconfig | |||
| @@ -23,8 +23,8 @@ if NET_VENDOR_FREESCALE | |||
| 23 | config FEC | 23 | config FEC |
| 24 | tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)" | 24 | tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)" |
| 25 | depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \ | 25 | depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \ |
| 26 | ARCH_MXC || ARCH_MXS) | 26 | ARCH_MXC || SOC_IMX28) |
| 27 | default ARCH_MXC || ARCH_MXS if ARM | 27 | default ARCH_MXC || SOC_IMX28 if ARM |
| 28 | select PHYLIB | 28 | select PHYLIB |
| 29 | ---help--- | 29 | ---help--- |
| 30 | Say Y here if you want to use the built-in 10/100 Fast ethernet | 30 | Say Y here if you want to use the built-in 10/100 Fast ethernet |