diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-05 03:35:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-05 03:35:43 +0100 |
| commit | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (patch) | |
| tree | c08e1c0357fde481a16489b77feb8f6073faf538 /drivers/net/ethernet/freescale/Kconfig | |
| parent | ipv6/addrconf: speedup /proc/net/if_inet6 filling (diff) | |
| parent | Linux 3.2 (diff) | |
| download | linux-117ff42fd43e92d24c6aa6f3e4f0f1e1edada140.tar.xz linux-117ff42fd43e92d24c6aa6f3e4f0f1e1edada140.zip | |
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 config FEC tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \ - ARCH_MXC || ARCH_MXS) - default ARCH_MXC || ARCH_MXS if ARM + ARCH_MXC || SOC_IMX28) + default ARCH_MXC || SOC_IMX28 if ARM select PHYLIB ---help--- Say Y here if you want to use the built-in 10/100 Fast ethernet |