[kernel] x86: Sync kernel config

[openwrt.git] / target / linux / ar7 / patches-2.6.25 / 900-temporary_cpmac_hack.diff

diff --git a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
index 43176f4..7da22cd 100644 (file)
--- a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
@@ -1,13 +1,11 @@
-Index: linux-2.6.25.1/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
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
 @@ -936,7 +936,8 @@
        int new_state = 0;
  
        spin_lock(&priv->lock);
 -      if (priv->phy->link) {
-+      if (1 /* priv->phy->link */ ) {
++      if (1 /* priv->phy->link */) {
 +              netif_carrier_on(dev);
                netif_start_queue(dev);
                if (priv->phy->duplex != priv->oldduplex) {