From b2cd29b28182f0b2e37b8cc025c6590c4c16356b Mon Sep 17 00:00:00 2001 From: Guo-Fu Tseng Date: Fri, 27 Feb 2009 17:58:16 +0000 Subject: [PATCH] --- yaml --- r: 134967 b: refs/heads/master c: eb352b838d42e66f0267c40249798ffda3c63037 h: refs/heads/master i: 134965: c2d3ca384493b921b2b04847e4f9bc0c91fad537 134963: e55b585371b6b3e6ad8d2ada144d8821b145a5eb 134959: 01c8548fa1fe165d67b56a4aa84d1084e9f87467 v: v3 --- [refs] | 2 +- trunk/drivers/net/jme.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a30a9083c115..550f60af001d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc +refs/heads/master: eb352b838d42e66f0267c40249798ffda3c63037 diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c index f65a09c363ed..47dd47fd0ace 100644 --- a/trunk/drivers/net/jme.c +++ b/trunk/drivers/net/jme.c @@ -429,10 +429,9 @@ jme_check_link(struct net_device *netdev, int testonly) jme->phylink = phylink; - ghc = jme->reg_ghc & ~(GHC_SPEED_10M | - GHC_SPEED_100M | - GHC_SPEED_1000M | - GHC_DPX); + ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX | + GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE | + GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY); switch (phylink & PHY_LINK_SPEED_MASK) { case PHY_LINK_SPEED_10M: ghc |= GHC_SPEED_10M |