Messages in this thread Patch in this message |  | | Date | Tue, 7 Jan 2003 18:01:14 +0100 | From | Adrian Bunk <> | Subject | Re: Linux 2.4.21-pre3 |
| |
On Mon, Jan 06, 2003 at 07:32:37PM -0200, Marcelo Tosatti wrote:
> So here goes -pre3... > > > Summary of changes from v2.4.21-pre2 to v2.4.21-pre3 > ============================================ >... > Jean Tourrilhes <jt@bougret.hpl.hp.com>: >... > o donauboe IrDA driver >...
Please apply the patch below (stolen from 2.5) that does the following: * C99 initializers * fix public symbol name conflict (compile error if both donauboe and toshoboe are compiled statically into the kernel) cu Adrian
--- 1.1/drivers/net/irda/donauboe.c Fri Oct 11 10:26:35 2002 +++ 1.2/drivers/net/irda/donauboe.c Thu Nov 7 12:57:09 2002 @@ -1825,26 +1825,26 @@ return 0; } -static struct pci_driver toshoboe_pci_driver = { - name : "toshoboe", - id_table : toshoboe_pci_tbl, - probe : toshoboe_open, - remove : toshoboe_close, - suspend : toshoboe_gotosleep, - resume : toshoboe_wakeup +static struct pci_driver donauboe_pci_driver = { + .name = "donauboe", + .id_table = toshoboe_pci_tbl, + .probe = toshoboe_open, + .remove = toshoboe_close, + .suspend = toshoboe_gotosleep, + .resume = toshoboe_wakeup }; -int __init -toshoboe_init (void) +static int __init +donauboe_init (void) { - return pci_module_init(&toshoboe_pci_driver); + return pci_module_init(&donauboe_pci_driver); } -STATIC void __exit -toshoboe_cleanup (void) +static void __exit +donauboe_cleanup (void) { - pci_unregister_driver(&toshoboe_pci_driver); + pci_unregister_driver(&donauboe_pci_driver); } -module_init(toshoboe_init); -module_exit(toshoboe_cleanup); +module_init(donauboe_init); +module_exit(donauboe_cleanup);
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |