From: David S. Miller <davem@davemloft.net>
Date: Tue, 3 Feb 2009 08:15:35 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/Kconfig
---

b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15
diff --cc drivers/net/Kconfig
index 0ec01e42e9b,6bdfd47d679..49f4d50abc5
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -1828,11 -1828,11 +1828,11 @@@ config 68360_ENE
  	  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
++	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 processors.
 +	  controller on some Motorola ColdFire and Freescale i.MX processors.
  
  config FEC2
  	bool "Second FEC ethernet controller (on some ColdFire CPUs)"