diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-12-22 03:50:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-12-23 08:09:44 +0100 |
| commit | 14904398e5b573d13f8c8dbd43a452ff34c0efc2 (patch) | |
| tree | 47ee2b44aee6999eb53c808367df23b57990c269 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-14904398e5b573d13f8c8dbd43a452ff34c0efc2.tar.xz linux-14904398e5b573d13f8c8dbd43a452ff34c0efc2.zip | |
[SUNGEM]: Fix link error with CONFIG_HOTPLUG disabled.
gem_remove_one() is called from the __devinit gem_init_one().
Therefore, gem_remove_one() mustn't be __devexit.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.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) 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, |