/[linux-patches]/genpatches-2.6/trunk/2.6.14/1076_6_gem_remove_one-no-devexit.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1076_6_gem_remove_one-no-devexit.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 252 - (show annotations) (download) (as text)
Tue Jan 10 19:01:52 2006 UTC (14 years, 10 months ago) by dsd
File MIME type: text/x-diff
File size: 1257 byte(s)
Linux 2.6.14.6 thanks to kerframil
1 From: Adrian Bunk <bunk@stusta.de>
2 Date: Thu, 29 Dec 2005 04:38:32 +0000 (+0100)
3 Subject: [PATCH] drivers/net/sungem.c: gem_remove_one mustn't be __devexit
4 X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/chrisw/linux-2.6.14.y.git;a=commitdiff;h=168e438187d99f5c6d73176efb673c0106b44304
5
6 [PATCH] drivers/net/sungem.c: gem_remove_one mustn't be __devexit
7
8 gem_remove_one() is called from the __devinit gem_init_one().
9
10 Therefore, gem_remove_one() mustn't be __devexit.
11
12 This patch was already included in 2.6.15-rc7.
13
14 Signed-off-by: Adrian Bunk <bunk@stusta.de>
15 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 ---
18
19 --- a/drivers/net/sungem.c
20 +++ b/drivers/net/sungem.c
21 @@ -2905,7 +2905,7 @@ static int __devinit gem_get_device_addr
22 return 0;
23 }
24
25 -static void __devexit gem_remove_one(struct pci_dev *pdev)
26 +static void gem_remove_one(struct pci_dev *pdev)
27 {
28 struct net_device *dev = pci_get_drvdata(pdev);
29
30 @@ -3179,7 +3179,7 @@ static struct pci_driver gem_driver = {
31 .name = GEM_MODULE_NAME,
32 .id_table = gem_pci_tbl,
33 .probe = gem_init_one,
34 - .remove = __devexit_p(gem_remove_one),
35 + .remove = gem_remove_one,
36 #ifdef CONFIG_PM
37 .suspend = gem_suspend,
38 .resume = gem_resume,

  ViewVC Help
Powered by ViewVC 1.1.20