patch-2.1.115 linux/drivers/block/genhd.c

Next file: linux/drivers/block/ide-pci.c
Previous file: linux/drivers/block/cmd646.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.114/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -1097,6 +1097,9 @@
 #ifdef CONFIG_MD_BOOT
         extern void md_setup_drive(void) __init;
 #endif
+#ifdef CONFIG_FC4_SOC
+	extern int soc_probe(void);
+#endif
 	struct gendisk *p;
 	int nr=0;
 
@@ -1106,6 +1109,10 @@
 	chr_dev_init();
 	blk_dev_init();
 	sti();
+#ifdef CONFIG_FC4_SOC
+	/* This has to be done before scsi_dev_init */
+	soc_probe();
+#endif
 #ifdef CONFIG_SCSI
 	scsi_dev_init();
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov