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/atlx | |
| 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/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 02761dd23fb8..b75aa295d37e 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
| @@ -1700,7 +1700,7 @@ static struct pci_driver atl2_driver = { | |||
| 1700 | .id_table = atl2_pci_tbl, | 1700 | .id_table = atl2_pci_tbl, |
| 1701 | .probe = atl2_probe, | 1701 | .probe = atl2_probe, |
| 1702 | .remove = __devexit_p(atl2_remove), | 1702 | .remove = __devexit_p(atl2_remove), |
| 1703 | /* Power Managment Hooks */ | 1703 | /* Power Management Hooks */ |
| 1704 | .suspend = atl2_suspend, | 1704 | .suspend = atl2_suspend, |
| 1705 | #ifdef CONFIG_PM | 1705 | #ifdef CONFIG_PM |
| 1706 | .resume = atl2_resume, | 1706 | .resume = atl2_resume, |