patch-2.1.70 linux/drivers/block/ll_rw_blk.c

• Lines: 24
• Date: Tue Dec 2 11:41:44 1997
• Orig file: v2.1.69/linux/drivers/block/ll_rw_blk.c
• Orig date: Wed Nov 12 13:34:25 1997

diff -u --recursive --new-file v2.1.69/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -654,7 +654,6 @@
 		}
 	}
 }
-
 #ifdef CONFIG_BLK_DEV_EZ
 extern void ez_init( void );
 #endif
@@ -694,9 +693,12 @@
 #ifdef CONFIG_BLK_DEV_LOOP
 	loop_init();
 #endif
-#ifdef CONFIG_CDI_INIT
-	cdi_init();		/* this MUST precede ide_init */
-#endif CONFIG_CDI_INIT
+#ifdef CONFIG_CDROM		/* this must precede all CD-ROM drivers */
+	cdrom_init();
+#endif CONFIG_CDROM
+#ifdef CONFIG_ISP16_CDI
+	isp16_init();
+#endif CONFIG_ISP16_CDI
 #ifdef CONFIG_BLK_DEV_IDE
 	ide_init();		/* this MUST precede hd_init */
 #endif