diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 10:11:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 10:11:50 -0800 |
| 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 081717d0137..28ce47a0240 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) return 0; } -static void __devexit gem_remove_one(struct pci_dev *pdev) +static void gem_remove_one(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); @@ -3181,7 +3181,7 @@ static struct pci_driver gem_driver = { .name = GEM_MODULE_NAME, .id_table = gem_pci_tbl, .probe = gem_init_one, - .remove = __devexit_p(gem_remove_one), + .remove = gem_remove_one, #ifdef CONFIG_PM .suspend = gem_suspend, .resume = gem_resume, |