From 168e438187d99f5c6d73176efb673c0106b44304 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 29 Dec 2005 05:38:32 +0100 Subject: [PATCH] [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 Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- drivers/net/sungem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index de399563a9d..da8c31dc07d 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, -- 2.34.1