Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0ec01e4..49f4d50 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1828,8 +1828,8 @@
the Motorola 68360 processor.
config FEC
- bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
- depends on M523x || M527x || M5272 || M528x || M520x || MACH_MX27
+ bool "FEC ethernet controller (of ColdFire CPUs)"
+ depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
help
Say Y here if you want to use the built-in 10/100 Fast ethernet
controller on some Motorola ColdFire and Freescale i.MX processors.