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

• Lines: 33
• Date: Thu Jul 19 17:48:15 2001
• Orig file: v2.4.6/linux/drivers/block/genhd.c
• Orig date: Wed May 16 14:01:32 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -21,13 +21,15 @@
 #ifdef CONFIG_BLK_DEV_DAC960
 extern void DAC960_Initialize(void);
 #endif
+#ifdef CONFIG_FUSION_BOOT
+extern int fusion_init(void);
+#endif
 extern int net_dev_init(void);
 extern void console_map_init(void);
 extern int soc_probe(void);
 extern int atmdev_init(void);
 extern int i2o_init(void);
 extern int cpqarray_init(void);
-extern void ieee1394_init(void);
 
 int __init device_init(void)
 {
@@ -39,12 +41,12 @@
 #ifdef CONFIG_BLK_DEV_DAC960
 	DAC960_Initialize();
 #endif
+#ifdef CONFIG_FUSION_BOOT
+	fusion_init();
+#endif
 #ifdef CONFIG_FC4_SOC
 	/* This has to be done before scsi_dev_init */
 	soc_probe();
-#endif
-#ifdef CONFIG_IEEE1394
-        ieee1394_init();
 #endif
 #ifdef CONFIG_BLK_CPQ_DA
 	cpqarray_init();