diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 13:11:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 13:11:50 -0500 |
| commit | 8f43d8e1147406901b7d972d1b528d94def23b0e (patch) | |
| tree | 8e0667ce322b79c6a9aade51dc9739f3dc9430fe /drivers/net | |
| parent | 7b3dad3d854654e470a598d361919ebdb858f37b (diff) | |
| parent | 597d1f0622d21ffe54aceef8da9682e776f51cc2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sungem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 081717d01374..28ce47a02408 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -2907,7 +2907,7 @@ static int __devinit gem_get_device_address(struct gem *gp) | |||
| 2907 | return 0; | 2907 | return 0; |
| 2908 | } | 2908 | } |
| 2909 | 2909 | ||
| 2910 | static void __devexit gem_remove_one(struct pci_dev *pdev) | 2910 | static void gem_remove_one(struct pci_dev *pdev) |
| 2911 | { | 2911 | { |
| 2912 | struct net_device *dev = pci_get_drvdata(pdev); | 2912 | struct net_device *dev = pci_get_drvdata(pdev); |
| 2913 | 2913 | ||
| @@ -3181,7 +3181,7 @@ static struct pci_driver gem_driver = { | |||
| 3181 | .name = GEM_MODULE_NAME, | 3181 | .name = GEM_MODULE_NAME, |
| 3182 | .id_table = gem_pci_tbl, | 3182 | .id_table = gem_pci_tbl, |
| 3183 | .probe = gem_init_one, | 3183 | .probe = gem_init_one, |
| 3184 | .remove = __devexit_p(gem_remove_one), | 3184 | .remove = gem_remove_one, |
| 3185 | #ifdef CONFIG_PM | 3185 | #ifdef CONFIG_PM |
| 3186 | .suspend = gem_suspend, | 3186 | .suspend = gem_suspend, |
| 3187 | .resume = gem_resume, | 3187 | .resume = gem_resume, |