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

• Lines: 36
• Date: Tue Jul 6 19:05:48 1999
• Orig file: v2.3.9/linux/drivers/cdrom/cdu31a.c
• Orig date: Wed May 12 13:27:37 1999

diff -u --recursive --new-file v2.3.9/linux/drivers/cdrom/cdu31a.c linux/drivers/cdrom/cdu31a.c
@@ -3251,10 +3251,10 @@
 /* The different types of disc loading mechanisms supported */
 static const char *load_mech[] __initdata = { "caddy", "tray", "pop-up", "unknown" };
 
-__initfunc(static void
+static void __init 
 get_drive_configuration(unsigned short base_io,
                         unsigned char res_reg[],
-                        unsigned int *res_size))
+                        unsigned int *res_size)
 {
    int retry_count;
 
@@ -3318,9 +3318,9 @@
 /*
  * Set up base I/O and interrupts, called from main.c.
  */
-__initfunc(void
+void __init 
 cdu31a_setup(char *strings,
-	     int  *ints))
+	     int  *ints)
 {
    if (ints[0] > 0)
    {
@@ -3349,8 +3349,8 @@
 /*
  * Initialize the driver.
  */
-__initfunc(int
-cdu31a_init(void))
+int __init 
+cdu31a_init(void)
 {
    struct s_sony_drive_config drive_config;
    unsigned int res_size;