From 7449083107e1a53194d112a71f154a95e8e8abee Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Sun, 13 May 2007 13:40:53 +1000
Subject: [PATCH] --- yaml --- r: 56597 b: refs/heads/master c:
 e38e3458804019c3fe9b17998e05fd1cd480806d h: refs/heads/master i:   56595:
 7c5e95af8b109921aff2b0b67e8a0f94687b464f v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/powerpc/platforms/44x/Kconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f31e356a87b..b72d81398e36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c1992f83304cf2d56934dd6c06709b96e1b0c81
+refs/heads/master: e38e3458804019c3fe9b17998e05fd1cd480806d
diff --git a/trunk/arch/powerpc/platforms/44x/Kconfig b/trunk/arch/powerpc/platforms/44x/Kconfig
index 8e66949e7c67..1b3e008fd148 100644
--- a/trunk/arch/powerpc/platforms/44x/Kconfig
+++ b/trunk/arch/powerpc/platforms/44x/Kconfig
@@ -38,7 +38,8 @@ config 440EP
 
 config 440GP
 	bool
-	select IBM_NEW_EMAC_ZMII
+# Disabled until the new EMAC Driver is merged.
+#	select IBM_NEW_EMAC_ZMII
 
 config 440GX
 	bool