diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-12-29 05:38:32 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-01-07 18:15:07 -0800 |
| commit | 168e438187d99f5c6d73176efb673c0106b44304 (patch) | |
| tree | c1e8749007a44d0c067386dc699c55761b97ee85 | |
| parent | 9b288acb26059e30e66f14bf8b1b75c9f3a208f1 (diff) | |
[PATCH] drivers/net/sungem.c: gem_remove_one mustn't be __devexit
gem_remove_one() is called from the __devinit gem_init_one().
Therefore, gem_remove_one() mustn't be __devexit.
This patch was already included in 2.6.15-rc7.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 de399563a9db..da8c31dc07d6 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -2905,7 +2905,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); @@ -3179,7 +3179,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, |