From 54877a3d14c716ab17f346023f48cc95eb07726c Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.welch@gefanuc.com>
Date: Tue, 18 Nov 2008 10:55:45 +0000
Subject: [PATCH] --- yaml --- r: 119453 b: refs/heads/master c:
 06597aa90a75621639dcaaf5fc07bcb01f752d45 h: refs/heads/master i:   119451:
 1a6247803ab56f75afc02a730c9625187004011f v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/powerpc/configs/86xx/gef_sbc610_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ffe3473ca550..4057bc0529be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f464ff581c247d82fcc0e7ef40c1ca6df9739068
+refs/heads/master: 06597aa90a75621639dcaaf5fc07bcb01f752d45
diff --git a/trunk/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/trunk/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 2da13e00a807..07ccaf89f379 100644
--- a/trunk/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/trunk/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -838,7 +838,7 @@ CONFIG_PHYLIB=y
 #
 # MII PHY device drivers
 #
-CONFIG_MARVELL_PHY=y
+# CONFIG_MARVELL_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_LXT_PHY is not set