From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 Jan 2012 02:35:43 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=117ff42fd43e92d24c6aa6f3e4f0f1e1edada140;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/davem/net
---

117ff42fd43e92d24c6aa6f3e4f0f1e1edada140
diff --cc drivers/net/ethernet/freescale/Kconfig
index 820de8b9ff08,9de37642f09f..3574e1499dfc
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@@ -21,10 -21,10 +21,10 @@@ config NET_VENDOR_FREESCAL
  if NET_VENDOR_FREESCALE
  
  config FEC
 -	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
 +	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