On Mon, 2013-11-11 at 11:37 -0800, Martin Michlmayr wrote:
> Unfortunately I cannot remember (and I cannot even read the commit
> messages right now because Alioth is done).
git svn tells me that r14178 was the following.
commit a3535d328fe523c7c3dd0db212ee4f34d2c40583
Author: tbm <tbm@510b9475-24dd-0310-9b6c-e0eefe99d49f>
Date: Sun Aug 23 15:51:33 2009 +0000
[armel/orion5x, armel/kirkwood] Disable MARVELL_PHY since it may
lead to conflicts with the build-in Ethernet.
git-svn-id: svn+ssh://svn.debian.org/svn/kernel/dists/trunk@14178
510b9475-24dd-0310-9b6c-e0eefe99d49f
diff --git a/linux-2.6/debian/changelog b/linux-2.6/debian/changelog
index 58f1bf7..6b5519a 100644
--- a/linux-2.6/debian/changelog
+++ b/linux-2.6/debian/changelog
@@ -68,6 +68,8 @@ linux-2.6 (2.6.31~rc7-1~experimental.1) UNRELEASED;
urgency=low
[ 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.
diff --git a/linux-2.6/debian/config/arm/config.orion5x
b/linux-2.6/debian/config/arm/config.orion5x
index a3a4325..bdbbfdf 100644
--- a/linux-2.6/debian/config/arm/config.orion5x
+++ b/linux-2.6/debian/config/arm/config.orion5x
@@ -619,3 +619,5 @@ CONFIG_X25=m
CONFIG_GPIO_SYSFS=y
+# CONFIG_MARVELL_PHY is not set
+
diff --git a/linux-2.6/debian/config/armel/config.kirkwood
b/linux-2.6/debian/config/armel/config.kirkwood
index 84d9028..55eeddc 100644
--- a/linux-2.6/debian/config/armel/config.kirkwood
+++ b/linux-2.6/debian/config/armel/config.kirkwood
@@ -626,3 +626,5 @@ CONFIG_X25=m
CONFIG_GPIO_SYSFS=y
+# CONFIG_MARVELL_PHY is not set
+
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1384440802.16096.6.ca...@hastur.hellion.org.uk
