Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / net / atl1e / atl1e_main.c

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 1ff001a..b0a71e2 100644 (file)
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2509,7 +2509,7 @@ static struct pci_driver atl1e_driver = {
        .id_table = atl1e_pci_tbl,
        .probe    = atl1e_probe,
        .remove   = __devexit_p(atl1e_remove),
-       /* Power Managment Hooks */
+       /* Power Management Hooks */
 #ifdef CONFIG_PM
        .suspend  = atl1e_suspend,
        .resume   = atl1e_resume,