Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 14904398e5b573d13f8c8dbd43a452ff34c0efc2

Authored by Adrian Bunk
Committed by David S. Miller
1 parent c162eeaa21
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/net/sungem.c
Diff comments   View file @ 1490439
... ... @@ -2907,7 +2907,7 @@
2907 2907 return 0;
2908 2908 }
2909 2909  
2910   -static void __devexit gem_remove_one(struct pci_dev *pdev)
  2910 +static void gem_remove_one(struct pci_dev *pdev)
2911 2911 {
2912 2912 struct net_device *dev = pci_get_drvdata(pdev);
2913 2913  
... ... @@ -3181,7 +3181,7 @@
3181 3181 .name = GEM_MODULE_NAME,
3182 3182 .id_table = gem_pci_tbl,
3183 3183 .probe = gem_init_one,
3184   - .remove = __devexit_p(gem_remove_one),
  3184 + .remove = gem_remove_one,
3185 3185 #ifdef CONFIG_PM
3186 3186 .suspend = gem_suspend,
3187 3187 .resume = gem_resume,