diff options
author | Jack F Vogel <jfv@FreeBSD.org> | 2011-02-12 00:07:40 +0000 |
---|---|---|
committer | Jack F Vogel <jfv@FreeBSD.org> | 2011-02-12 00:07:40 +0000 |
commit | 730d313078b617cdf4b57f0cc319b4bbb3c38a36 (patch) | |
tree | 126c96cf5d9e9d2cdd45ae7f3a864b8910d6466e /sys/dev/e1000/e1000_82541.c | |
parent | 8c1bde8dd07e0bcc566b10fc4b23a7f5dee23e2e (diff) | |
download | src-730d313078b617cdf4b57f0cc319b4bbb3c38a36.tar.gz src-730d313078b617cdf4b57f0cc319b4bbb3c38a36.zip |
Fix the shared code to be consistent with Intel-internal,
and now build.
Notes
Notes:
svn path=/head/; revision=218588
Diffstat (limited to 'sys/dev/e1000/e1000_82541.c')
-rw-r--r-- | sys/dev/e1000/e1000_82541.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/e1000/e1000_82541.c b/sys/dev/e1000/e1000_82541.c index fd8d8ebbe746..7c9605b5fb18 100644 --- a/sys/dev/e1000/e1000_82541.c +++ b/sys/dev/e1000/e1000_82541.c @@ -300,7 +300,7 @@ void e1000_init_function_pointers_82541(struct e1000_hw *hw) **/ static s32 e1000_reset_hw_82541(struct e1000_hw *hw) { - u32 ledctl, ctrl, icr, manc; + u32 ledctl, ctrl, manc; DEBUGFUNC("e1000_reset_hw_82541"); @@ -364,7 +364,7 @@ static s32 e1000_reset_hw_82541(struct e1000_hw *hw) E1000_WRITE_REG(hw, E1000_IMC, 0xFFFFFFFF); /* Clear any pending interrupt events. */ - icr = E1000_READ_REG(hw, E1000_ICR); + E1000_READ_REG(hw, E1000_ICR); return E1000_SUCCESS; } @@ -390,7 +390,7 @@ static s32 e1000_init_hw_82541(struct e1000_hw *hw) DEBUGOUT("Error initializing identification LED\n"); /* This is not fatal and we should not stop init due to this */ } - + /* Storing the Speed Power Down value for later use */ ret_val = hw->phy.ops.read_reg(hw, IGP01E1000_GMII_FIFO, |