diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
tree | b384aef82007144b067cc171d2a9aa168b50b262 /drivers/net/e1000/e1000_hw.c | |
parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
Diffstat (limited to 'drivers/net/e1000/e1000_hw.c')
-rw-r--r-- | drivers/net/e1000/e1000_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 65077f39da6..796c4f7d426 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -3868,7 +3868,7 @@ e1000_phy_hw_reset(struct e1000_hw *hw) | |||
3868 | * | 3868 | * |
3869 | * hw - Struct containing variables accessed by shared code | 3869 | * hw - Struct containing variables accessed by shared code |
3870 | * | 3870 | * |
3871 | * Sets bit 15 of the MII Control regiser | 3871 | * Sets bit 15 of the MII Control register |
3872 | ******************************************************************************/ | 3872 | ******************************************************************************/ |
3873 | int32_t | 3873 | int32_t |
3874 | e1000_phy_reset(struct e1000_hw *hw) | 3874 | e1000_phy_reset(struct e1000_hw *hw) |