diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/e1000/e1000_main.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index bfab14092d2..477e066a1cf 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 |