via-rhine for 2.5.5
Subsystems (2)
PATCH 1/1 via-rhine for 2.5.5
Hi,
It seems that the following patch is necessary for via-rhine to compile.
net/via-rhine.c renamed from net/via-rhine.c.orig +2 -2
@@ -1754,7 +1754,7 @@ name: "via-rhine", id_table: via_rhine_pci_tbl, probe: via_rhine_init_one, - remove: via_rhine_remove_one, + remove: __devexit_p(via_rhine_remove_one), };
@@ -1768,7 +1768,7 @@ } -static void __exit via_rhine_cleanup (void) +static void __devexit via_rhine_cleanup (void) {pci_unregister_driver (&via_rhine_driver); }
Regards
Signature · 3 lines
Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 3, quai Kléber, Tour Sébastopol Tel : +33 388 23 69 77 [email protected] F-67080 STRASBOURG Cedex 3 Fax : +33 388 23 70 00 http://logidee.com
net/via-rhine.c Thu Feb 21 10:55:39 2002 line 1754
Quoted 5 lines · Stephane Casset
net/via-rhine.c Thu Feb 21 10:55:39 2002 renamed from net/via-rhine.c.orig Thu Feb 21 10:49:54 2002 +1
-1@@ -1754,7 +1754,7 @@ - remove: via_rhine_remove_one, + remove: __devexit_p(via_rhine_remove_one),
this is ok
net/via-rhine.c Thu Feb 21 10:55:39 2002 line 1755
Quoted 2 lines
net/via-rhine.c Thu Feb 21 10:55:39 2002 renamed from net/via-rhine.c.orig Thu Feb 21 10:49:54 2002 +1
-1-static void __exit via_rhine_cleanup (void) +static void __devexit via_rhine_cleanup (void)
this is definitely wrong
I'm also surprised you managed to compile via-rhine without the attached patch, which is needed to fix the build.
Jeff
Signature · 4 lines
Jeff Garzik | "Why is it that attractive girls like you
Building 1024 | always seem to have a boyfriend?"
MandrakeSoft | "Because I'm a nympho that owns a brewery?"
| - BBC TV show "Coupling"drivers/net/via-rhine.c +2 -1
@@ -321,6 +321,7 @@VT86C100A =0 ,VT6102 ,VT3043 , + VT6105, }; struct via_rhine_chip_info {
@@ -349,7 +350,7 @@ {"VIA VT6102 Rhine-II" ,RHINE_IOTYPE ,256 , CanHaveMII | HasWOL }, { "VIA VT3043 Rhine", RHINE_IOTYPE, 128, - CanHaveMII | ReqTxAlign } + CanHaveMII | ReqTxAlign }, { "VIA VT6105 Rhine-III", RHINE_IOTYPE, 256, CanHaveMII | HasWOL }, };