diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-03-30 21:57:33 -0400 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-03-31 10:26:23 -0400 |
commit | 25985edcedea6396277003854657b5f3cb31a628 (patch) | |
tree | f026e810210a2ee7290caeb737c23cb6472b7c38 /drivers/net/e1000 | |
parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) |
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_hw.h | 2 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index f4d0922ec65b..dd70738eb2f4 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -160,7 +160,7 @@ static int e1000_get_settings(struct net_device *netdev, | |||
160 | &adapter->link_duplex); | 160 | &adapter->link_duplex); |
161 | ecmd->speed = adapter->link_speed; | 161 | ecmd->speed = adapter->link_speed; |
162 | 162 | ||
163 | /* unfortunatly FULL_DUPLEX != DUPLEX_FULL | 163 | /* unfortunately FULL_DUPLEX != DUPLEX_FULL |
164 | * and HALF_DUPLEX != DUPLEX_HALF */ | 164 | * and HALF_DUPLEX != DUPLEX_HALF */ |
165 | 165 | ||
166 | if (adapter->link_duplex == FULL_DUPLEX) | 166 | if (adapter->link_duplex == FULL_DUPLEX) |
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index c70b23d52284..5c9a8403668b 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -1026,7 +1026,7 @@ extern void __iomem *ce4100_gbe_mdio_base_virt; | |||
1026 | 1026 | ||
1027 | #define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */ | 1027 | #define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */ |
1028 | #define E1000_MDPHYA 0x0003C /* PHY address - RW */ | 1028 | #define E1000_MDPHYA 0x0003C /* PHY address - RW */ |
1029 | #define E1000_MANC2H 0x05860 /* Managment Control To Host - RW */ | 1029 | #define E1000_MANC2H 0x05860 /* Management Control To Host - RW */ |
1030 | #define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */ | 1030 | #define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */ |
1031 | 1031 | ||
1032 | #define E1000_GCR 0x05B00 /* PCI-Ex Control */ | 1032 | #define E1000_GCR 0x05B00 /* PCI-Ex Control */ |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index bfab14092d2c..477e066a1cf0 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -205,7 +205,7 @@ static struct pci_driver e1000_driver = { | |||
205 | .probe = e1000_probe, | 205 | .probe = e1000_probe, |
206 | .remove = __devexit_p(e1000_remove), | 206 | .remove = __devexit_p(e1000_remove), |
207 | #ifdef CONFIG_PM | 207 | #ifdef CONFIG_PM |
208 | /* Power Managment Hooks */ | 208 | /* Power Management Hooks */ |
209 | .suspend = e1000_suspend, | 209 | .suspend = e1000_suspend, |
210 | .resume = e1000_resume, | 210 | .resume = e1000_resume, |
211 | #endif | 211 | #endif |