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

• Lines: 19
• Date: Sun Mar 29 12:24:05 1998
• Orig file: v2.1.91/linux/drivers/block/ll_rw_blk.c
• Orig date: Tue Mar 17 22:18:14 1998

diff -u --recursive --new-file v2.1.91/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -428,6 +428,8 @@
 	     case FLOPPY_MAJOR:
 	     case IDE2_MAJOR:
 	     case IDE3_MAJOR:
+	     case IDE4_MAJOR:
+	     case IDE5_MAJOR:
 	     case ACSI_MAJOR:
 		/*
 		 * The scsi disk and cdrom drivers completely remove the request
@@ -716,9 +718,6 @@
 #ifdef CONFIG_BLK_DEV_LOOP
 	loop_init();
 #endif
-#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