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/atl1e | |
| 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/atl1e')
| -rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index c05b2e7c93d0..9900ca1d8eda 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
| @@ -2505,7 +2505,7 @@ static struct pci_driver atl1e_driver = { | |||
| 2505 | .id_table = atl1e_pci_tbl, | 2505 | .id_table = atl1e_pci_tbl, |
| 2506 | .probe = atl1e_probe, | 2506 | .probe = atl1e_probe, |
| 2507 | .remove = __devexit_p(atl1e_remove), | 2507 | .remove = __devexit_p(atl1e_remove), |
| 2508 | /* Power Managment Hooks */ | 2508 | /* Power Management Hooks */ |
| 2509 | #ifdef CONFIG_PM | 2509 | #ifdef CONFIG_PM |
| 2510 | .suspend = atl1e_suspend, | 2510 | .suspend = atl1e_suspend, |
| 2511 | .resume = atl1e_resume, | 2511 | .resume = atl1e_resume, |