[kernel] r14178 - in dists/trunk/linux-2.6/debian: . config/arm config/armel

[Martin Michlmayr]

Author: tbm
Date: Sun Aug 23 15:51:33 2009
New Revision: 14178

Log:
[armel/orion5x, armel/kirkwood] Disable MARVELL_PHY since it may
lead to conflicts with the build-in Ethernet.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.orion5x
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Aug 23 15:26:58 2009	(r14177)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Aug 23 15:51:33 2009	(r14178)
@@ -68,6 +68,8 @@
   [ Martin Michlmayr ]
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
     platforms have been converted to GPIOLIB.
+  * [armel/orion5x, armel/kirkwood] Disable MARVELL_PHY since it may
+    lead to conflicts with the build-in Ethernet.
 
   [ Bastian Blank ]
   * Disable staging drivers by default.

Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Sun Aug 23 15:26:58 2009	(r14177)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Sun Aug 23 15:51:33 2009	(r14178)
@@ -619,3 +619,5 @@
 
 CONFIG_GPIO_SYSFS=y
 
+# CONFIG_MARVELL_PHY is not set
+

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sun Aug 23 15:26:58 2009	(r14177)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sun Aug 23 15:51:33 2009	(r14178)
@@ -626,3 +626,5 @@
 
 CONFIG_GPIO_SYSFS=y
 
+# CONFIG_MARVELL_PHY is not set
+