diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/net/atlx | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/net/atlx')
| -rw-r--r-- | drivers/net/atlx/atl2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 937ef1afa5db..e3cbf45dc612 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
| @@ -1701,7 +1701,7 @@ static struct pci_driver atl2_driver = { | |||
| 1701 | .id_table = atl2_pci_tbl, | 1701 | .id_table = atl2_pci_tbl, |
| 1702 | .probe = atl2_probe, | 1702 | .probe = atl2_probe, |
| 1703 | .remove = __devexit_p(atl2_remove), | 1703 | .remove = __devexit_p(atl2_remove), |
| 1704 | /* Power Managment Hooks */ | 1704 | /* Power Management Hooks */ |
| 1705 | .suspend = atl2_suspend, | 1705 | .suspend = atl2_suspend, |
| 1706 | #ifdef CONFIG_PM | 1706 | #ifdef CONFIG_PM |
| 1707 | .resume = atl2_resume, | 1707 | .resume = atl2_resume, |