Update of /cvsroot/linux-vax/kernel-2.4/drivers/char/joystick
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/char/joystick
Modified Files:
cs461x.c emu10k1-gp.c pcigame.c
Log Message:
DA: sync with Marcelo 2.4.17
Index: cs461x.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/joystick/cs461x.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cs461x.c 11 Apr 2002 13:31:03 -0000 1.1
+++ cs461x.c 10 Jun 2003 01:13:28 -0000 1.2
@@ -313,7 +313,7 @@
name: "PCI Gameport",
id_table: cs461x_pci_tbl,
probe: cs461x_pci_probe,
- remove: cs461x_pci_remove,
+ remove: __devexit_p(cs461x_pci_remove),
};
int __init js_cs461x_init(void)
Index: emu10k1-gp.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/joystick/emu10k1-gp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emu10k1-gp.c 11 Apr 2002 13:31:03 -0000 1.1
+++ emu10k1-gp.c 10 Jun 2003 01:13:28 -0000 1.2
@@ -108,7 +108,7 @@
name: "Emu10k1 Gameport",
id_table: emu_tbl,
probe: emu_probe,
- remove: emu_remove,
+ remove: __devexit_p(emu_remove),
};
int __init emu_init(void)
Index: pcigame.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/joystick/pcigame.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcigame.c 11 Apr 2002 13:31:03 -0000 1.2
+++ pcigame.c 10 Jun 2003 01:13:28 -0000 1.3
@@ -180,7 +180,7 @@
name: "pcigame",
id_table: pcigame_id_table,
probe: pcigame_probe,
- remove: pcigame_remove,
+ remove: __devexit_p(pcigame_remove),
};
int __init pcigame_init(void)
|
