diff options
| author |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-03-02 18:46:29 -0800 |
|---|---|---|
| committer |   root <root@jk-desktop.jf.intel.com> | 2006-03-02 18:46:29 -0800 |
| commit | 0f15a8fae8b8558f5a9b0fec770846c487c779f6 (patch) | |
| tree | cacee876371cfbcb33e8e5a5410359f4d21b67ef /drivers/net/e1000/e1000_hw.c | |
| parent | e1000: Added a performance enhancement - prefetch (diff) | |
| download | linux-dev-0f15a8fae8b8558f5a9b0fec770846c487c779f6.tar.xz linux-dev-0f15a8fae8b8558f5a9b0fec770846c487c779f6.zip | |
e1000: Added driver comments and whitespace changes. Modified long lines of code to ensure they would not wrap beyond 80 characters.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_hw.c')
| -rw-r--r-- | drivers/net/e1000/e1000_hw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 63e237084a51..523c2c9fc0ac 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c @@ -3498,7 +3498,7 @@ e1000_phy_hw_reset(struct e1000_hw *hw) * bit. Then, take it out of reset. * For pre-e1000_82571 hardware, we delay for 10ms between the assert * and deassert. For e1000_82571 hardware and later, we instead delay - * for 10ms after the deassertion. + * for 50us between and 10ms after the deassertion. */ ctrl = E1000_READ_REG(hw, CTRL); E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PHY_RST); @@ -3920,7 +3920,8 @@ e1000_validate_mdi_setting(struct e1000_hw *hw) /****************************************************************************** * Sets up eeprom variables in the hw struct. Must be called after mac_type - * is configured. + * is configured. Additionally, if this is ICH8, the flash controller GbE + * registers must be mapped, or this will crash. * * hw - Struct containing variables accessed by shared code *****************************************************************************/ |