diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 16:44:07 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 16:44:07 -0400 |
| commit | 0cd3fd78e5951c1631ee60a2026603d63c671d98 (patch) | |
| tree | 5569b2135a8920aee9b4456691e995a499c31131 /drivers/net | |
| parent | a90b3dcb115ec561b6bae4874e63ddc51720128b (diff) | |
| parent | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (diff) | |
Merge commit '9ced9f0' (rmk/devel-stable) into linaro-2.6.38
Conflicts:
arch/arm/mach-mxs/gpio.c
drivers/usb/gadget/fsl_mxc_udc.c
Diffstat (limited to 'drivers/net')
| -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 03823327db2..9928115496e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1944,7 +1944,7 @@ config 68360_ENET config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 + IMX_HAVE_PLATFORM_FEC || SOC_IMX28 select PHYLIB help Say Y here if you want to use the built-in 10/100 Fast ethernet |