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

• Lines: 66
• Date: Tue Jul 6 19:05:48 1999
• Orig file: v2.3.9/linux/drivers/cdrom/isp16.c
• Orig date: Tue Dec 2 11:41:44 1997

diff -u --recursive --new-file v2.3.9/linux/drivers/cdrom/isp16.c linux/drivers/cdrom/isp16.c
@@ -77,8 +77,8 @@
 #define ISP16_OUT(p,b) (outb(isp16_ctrl,ISP16_CTRL_PORT), outb(b,p))
 
 
-__initfunc(void
-isp16_setup(char *str, int *ints))
+void __init 
+isp16_setup(char *str, int *ints)
 {
   if ( ints[0] > 0 )
     isp16_cdrom_base = ints[1];
@@ -94,8 +94,8 @@
  *  ISP16 initialisation.
  *
  */
-__initfunc(int
-isp16_init(void))
+int __init 
+isp16_init(void)
 {
   u_char expected_drive;
 
@@ -144,8 +144,8 @@
   return(0);
 }
 
-__initfunc(static short
-isp16_detect(void))
+static short __init 
+isp16_detect(void)
 {
 
   if ( isp16_c929__detect() >= 0 )
@@ -154,8 +154,8 @@
     return(isp16_c928__detect());
 }
 
-__initfunc(static short
-isp16_c928__detect(void))
+static short __init 
+isp16_c928__detect(void)
 {
   u_char ctrl;
   u_char enable_cdrom;
@@ -203,8 +203,8 @@
   return(i);
 }
 
-__initfunc(static short
-isp16_c929__detect(void))
+static short __init 
+isp16_c929__detect(void)
 {
   u_char ctrl;
   u_char tmp;
@@ -230,8 +230,8 @@
   return(2);
 }
 
-__initfunc(static short
-isp16_cdi_config(int base, u_char drive_type, int irq, int dma))
+static short __init 
+isp16_cdi_config(int base, u_char drive_type, int irq, int dma)
 {
   u_char base_code;
   u_char irq_code;