From bcedb02859d2b1093721397a8eedeb62b0d408b3 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Sun, 23 Aug 2009 15:51:33 +0000 Subject: [PATCH] [armel/orion5x, armel/kirkwood] Disable MARVELL_PHY since it may lead to conflicts with the build-in Ethernet. svn path=/dists/trunk/linux-2.6/; revision=14178 --- debian/changelog | 2 ++ debian/config/arm/config.orion5x | 2 ++ debian/config/armel/config.kirkwood | 2 ++ 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 58f1bf7b7..6b5519a38 100644 --- a/debian/changelog +++ b/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/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x index a3a432573..bdbbfdfe1 100644 --- a/debian/config/arm/config.orion5x +++ b/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/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 84d90288a..55eeddc90 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -626,3 +626,5 @@ CONFIG_X25=m CONFIG_GPIO_SYSFS=y +# CONFIG_MARVELL_PHY is not set +