From 6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 23 Mar 2004 23:20:24 +0000
Subject: * Patch by Stephen Williams, 19 March 2004   Increase speed of sector
 reads from SystemACE,   shorten poll timeout and remove a useless reset

* Patch by Tolunay Orkun, 19 Mar 2004:
  Make GigE PHY 1000Mbps Speed/Duplex detection conditional
  (CONFIG_PHY_GIGE)

* Patch by Brad Kemp, 18 Mar 2004:
  prevent machine checks during a PCI scan

* Patch by Pierre Aubert, 18 Mar 2004:
  Fix string cleaning in IDE identification
---
 common/miiphyutil.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'common/miiphyutil.c')

diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index f6436cf245..919de3ebc5 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -135,6 +135,7 @@ int miiphy_speed (unsigned char addr)
 {
 	unsigned short reg;
 
+#if defined(CONFIG_PHY_GIGE)
 	if (miiphy_read (addr, PHY_1000BTSR, &reg)) {
 		printf ("PHY 1000BT Status read failed\n");
 	} else {
@@ -144,6 +145,7 @@ int miiphy_speed (unsigned char addr)
 			}
 		}
 	}
+#endif /* CONFIG_PHY_GIGE */
 
 	if (miiphy_read (addr, PHY_ANLPAR, &reg)) {
 		puts ("PHY speed1 read failed, assuming 10bT\n");
@@ -165,7 +167,7 @@ int miiphy_duplex (unsigned char addr)
 {
 	unsigned short reg;
 
-
+#if defined(CONFIG_PHY_GIGE)
 	if (miiphy_read (addr, PHY_1000BTSR, &reg)) {
 		printf ("PHY 1000BT Status read failed\n");
 	} else {
@@ -178,6 +180,7 @@ int miiphy_duplex (unsigned char addr)
 			}
 		}
 	}
+#endif /* CONFIG_PHY_GIGE */
 
 	if (miiphy_read (addr, PHY_ANLPAR, &reg)) {
 		puts ("PHY duplex read failed, assuming half duplex\n");
-- 
cgit