-Index: linux-2.6.25.1/drivers/net/cpmac.c
+Index: linux-2.6.25.4/drivers/net/cpmac.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:24:49.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:25:17.000000000 +0200
-@@ -936,7 +936,8 @@
+--- linux-2.6.25.4.orig/drivers/net/cpmac.c
++++ linux-2.6.25.4/drivers/net/cpmac.c
+@@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
int new_state = 0;
spin_lock(&priv->lock);
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -948,11 +949,11 @@
+@@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
priv->oldspeed = priv->phy->speed;
}