summaryrefslogtreecommitdiffstats
path: root/sys/dev/e1000/e1000_82540.c
diff options
context:
space:
mode:
authorjfv <jfv@FreeBSD.org>2011-02-12 00:07:40 +0000
committerjfv <jfv@FreeBSD.org>2011-02-12 00:07:40 +0000
commit5d74a0ea2957e5b1ece5dcaf04d74c25a9aca5bf (patch)
tree126c96cf5d9e9d2cdd45ae7f3a864b8910d6466e /sys/dev/e1000/e1000_82540.c
parentad537faab09bc6457667da3b740f2a79e30b6cde (diff)
downloadFreeBSD-src-5d74a0ea2957e5b1ece5dcaf04d74c25a9aca5bf.zip
FreeBSD-src-5d74a0ea2957e5b1ece5dcaf04d74c25a9aca5bf.tar.gz
Fix the shared code to be consistent with Intel-internal,
and now build.
Diffstat (limited to 'sys/dev/e1000/e1000_82540.c')
-rw-r--r--sys/dev/e1000/e1000_82540.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/e1000/e1000_82540.c b/sys/dev/e1000/e1000_82540.c
index 80a58777..35018ce 100644
--- a/sys/dev/e1000/e1000_82540.c
+++ b/sys/dev/e1000/e1000_82540.c
@@ -269,7 +269,7 @@ void e1000_init_function_pointers_82540(struct e1000_hw *hw)
**/
static s32 e1000_reset_hw_82540(struct e1000_hw *hw)
{
- u32 ctrl, icr, manc;
+ u32 ctrl, manc;
s32 ret_val = E1000_SUCCESS;
DEBUGFUNC("e1000_reset_hw_82540");
@@ -314,7 +314,7 @@ static s32 e1000_reset_hw_82540(struct e1000_hw *hw)
E1000_WRITE_REG(hw, E1000_MANC, manc);
E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
- icr = E1000_READ_REG(hw, E1000_ICR);
+ E1000_READ_REG(hw, E1000_ICR);
return ret_val;
}
OpenPOWER on IntegriCloud