patch-2.1.37 linux/drivers/cdrom/sbpcd.c

• Lines: 84
• Date: Mon May 12 10:35:39 1997
• Orig file: v2.1.36/linux/drivers/cdrom/sbpcd.c
• Orig date: Fri Apr 4 08:52:18 1997

diff -u --recursive --new-file v2.1.36/linux/drivers/cdrom/sbpcd.c linux/drivers/cdrom/sbpcd.c
@@ -328,6 +328,7 @@
 #include <linux/major.h> 
 #include <linux/string.h>
 #include <linux/vmalloc.h>
+#include <linux/init.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -3052,7 +3053,7 @@
 }
 #endif FUTURE
 /*==========================================================================*/
-static void check_datarate(void)
+__initfunc(static void check_datarate(void))
 {
 	int i=0;
 	
@@ -3122,7 +3123,7 @@
 }
 #endif
 /*==========================================================================*/
-static void ask_mail(void)
+__initfunc(static void ask_mail(void))
 {
 	int i;
 	
@@ -3141,7 +3142,7 @@
 	msg(DBG_INF,"infobuf =%s\n", msgbuf);
 }
 /*==========================================================================*/
-static int check_version(void)
+__initfunc(static int check_version(void))
 {
 	int i, j, l;
 	int teac_possible=0;
@@ -3439,7 +3440,7 @@
 /*
  * probe for the presence of an interface card
  */
-static int check_card(int port)
+__initfunc(static int check_card(int port))
 {
 #undef N_RESPO
 #define N_RESPO 20
@@ -3543,7 +3544,7 @@
 /*
  * probe for the presence of drives on the selected controller
  */
-static int check_drives(void)
+__initfunc(static int check_drives(void))
 {
 	int i, j;
 	
@@ -5285,9 +5286,10 @@
  *
  */
 #if (SBPCD_ISSUE-1)
-static
+__initfunc(static void sbpcd_setup(const char *s, int *p))
+#else
+__initfunc(void sbpcd_setup(const char *s, int *p))
 #endif
-void sbpcd_setup(const char *s, int *p)
 {
 	setup_done++;
 	msg(DBG_INI,"sbpcd_setup called with %04X,%s\n",p[1], s);
@@ -5338,7 +5340,7 @@
  *        port 0x330, we have to use an offset of 8; so, the real CDROM port
  *        address is 0x338.
  */
-static int config_spea(void)
+__initfunc(static int config_spea(void))
 {
 	/*
          * base address offset between configuration port and CDROM port,
@@ -5397,7 +5399,7 @@
 #ifdef MODULE
 int init_module(void)
 #else
-int SBPCD_INIT(void)
+__initfunc(int SBPCD_INIT(void))
 #endif MODULE
 {
 	int i=0, j=0;