diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-14 12:43:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-14 12:43:10 -0800 |
| commit | 3b8f5945a24c78c77a88bd747812f7e07e075c7c (patch) | |
| tree | dbd120f16acc181f662fe99dbfec9ea29d24dd5a /drivers/net/e1000e/phy.c | |
| parent | 886d7f444cbf72d5a424ea5fee4e34a0219d4af1 (diff) | |
| parent | af667a29dd3dfc0464f83bac30cc3c63fe5d0206 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'drivers/net/e1000e/phy.c')
| -rw-r--r-- | drivers/net/e1000e/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index a640f1c369a..326788eab2f 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel PRO/1000 Linux driver - Copyright(c) 1999 - 2010 Intel Corporation. + Copyright(c) 1999 - 2011 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -640,7 +640,7 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw) s32 ret_val; u16 phy_data; - /* Enable CRS on TX. This must be set for half-duplex operation. */ + /* Enable CRS on Tx. This must be set for half-duplex operation. */ ret_val = e1e_rphy(hw, I82577_CFG_REG, &phy_data); if (ret_val) goto out; |