patch-2.1.37 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.1.36/linux/drivers/cdrom/optcd.c linux/drivers/cdrom/optcd.c
@@ -65,6 +65,7 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/ioport.h>
+#include <linux/init.h>
 #include <asm/io.h>
 
 #define MAJOR_NR OPTICS_CDROM_MAJOR
@@ -1961,7 +1962,7 @@
 
 /* Returns 1 if a drive is detected with a version string
    starting with "DOLPHIN". Otherwise 0. */
-static int version_ok(void)
+__initfunc(static int version_ok(void))
 {
 	char devname[100];
 	int count, i, ch, status;
@@ -2016,7 +2017,7 @@
 
 
 /* Get kernel parameter when used as a kernel driver */
-void optcd_setup(char *str, int *ints)
+__initfunc(void optcd_setup(char *str, int *ints))
 {
 	if (ints[0] > 0)
 		optcd_port = ints[1];
@@ -2024,7 +2025,7 @@
 
 /* Test for presence of drive and initialize it. Called at boot time
    or during module initialisation. */
-int optcd_init(void)
+__initfunc(int optcd_init(void))
 {
 	int status;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov