From b607d9b6582c6b6a8c433fb5a7adc07784e8c74f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 2 Dec 2011 12:37:33 -0500 Subject: [PATCH] --- yaml --- r: 278325 b: refs/heads/master c: 1d214fa34fc7878d90e0963f9eb4895510db5e48 h: refs/heads/master i: 278323: f1d1693d6fa36b5efefbe6d18c6a067089000284 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/niu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1418699fbd6..f35ef4d6a47f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efa230f2c68abab817f13473077f8d0cc74f43f3 +refs/heads/master: 1d214fa34fc7878d90e0963f9eb4895510db5e48 diff --git a/trunk/drivers/net/ethernet/sun/niu.c b/trunk/drivers/net/ethernet/sun/niu.c index 88e6b1501ec8..cf433931304f 100644 --- a/trunk/drivers/net/ethernet/sun/niu.c +++ b/trunk/drivers/net/ethernet/sun/niu.c @@ -8589,7 +8589,7 @@ static int __devinit phy_record(struct niu_parent *parent, if (dev_id_1 < 0 || dev_id_2 < 0) return 0; if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) { - /* Becuase of the NIU_PHY_ID_MASK being applied, the 8704 + /* Because of the NIU_PHY_ID_MASK being applied, the 8704 * test covers the 8706 as well. */ if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) &&