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

• Lines: 20
• Date: Fri May 10 08:05:59 1996
• Orig file: v1.3.99/linux/drivers/block/ll_rw_blk.c
• Orig date: Tue May 7 16:22:22 1996

diff -u --recursive --new-file v1.3.99/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -617,6 +617,9 @@
 #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_BLK_DEV_IDE
 	ide_init();		/* this MUST precede hd_init */
 #endif
@@ -631,9 +634,6 @@
 #else
 	outb_p(0xc, 0x3f2);
 #endif
-#ifdef CONFIG_CDI_INIT
-	cdi_init();
-#endif CONFIG_CDI_INIT
 #ifdef CONFIG_CDU31A
 	cdu31a_init();
 #endif CONFIG_CDU31A