patch-2.3.10 linux/drivers/cdrom/optcd.c

Next file: linux/drivers/cdrom/sbpcd.c
Previous file: linux/drivers/cdrom/mcdx.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/drivers/cdrom/optcd.c linux/drivers/cdrom/optcd.c
@@ -1966,7 +1966,7 @@
 
 /* Returns 1 if a drive is detected with a version string
    starting with "DOLPHIN". Otherwise 0. */
-__initfunc(static int version_ok(void))
+static int __init version_ok(void)
 {
 	char devname[100];
 	int count, i, ch, status;
@@ -2022,7 +2022,7 @@
 
 
 /* Get kernel parameter when used as a kernel driver */
-__initfunc(void optcd_setup(char *str, int *ints))
+void __init optcd_setup(char *str, int *ints)
 {
 	if (ints[0] > 0)
 		optcd_port = ints[1];
@@ -2030,7 +2030,7 @@
 
 /* Test for presence of drive and initialize it. Called at boot time
    or during module initialisation. */
-__initfunc(int optcd_init(void))
+int __init optcd_init(void)
 {
 	int status;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)