mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
[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>
This commit is contained in:
parent
9b288acb26
commit
168e438187
1 changed files with 2 additions and 2 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue