diff -Naur Makefile Makefile
--- Makefile	2000/02/23 21:02:03
+++ Makefile	2000/12/14 18:03:07
@@ -122,6 +122,10 @@
 
 DRIVERS := $(DRIVERS) drivers/net/net.a
 
+ifdef CONFIG_FUSION_BOOT
+DRIVERS := $(DRIVERS) drivers/message/fusion/fusion.o
+endif
+
 ifeq ($(CONFIG_SCSI),y)
 DRIVERS := $(DRIVERS) drivers/scsi/scsi.a
 endif
diff -Naur arch/i386/config.in arch/i386/config.in
--- arch/i386/config.in	2000/02/23 21:02:09
+++ arch/i386/config.in	2000/10/01 18:39:13
@@ -122,6 +122,8 @@
   source net/Config.in
 fi
 
+source drivers/message/fusion/Config.in
+
 mainmenu_option next_comment
 comment 'SCSI support'
 
diff -Naur drivers/Makefile drivers/Makefile
--- drivers/Makefile	2000/02/23 21:02:13
+++ drivers/Makefile	2000/12/02 09:52:51
@@ -10,7 +10,7 @@
 SUB_DIRS     := block char net misc sound
 MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS) pci scsi sbus cdrom isdn pnp \
-				 macintosh video dio zorro fc4
+				 macintosh video dio zorro fc4 message/fusion
 
 ifdef CONFIG_DIO
 SUB_DIRS += dio
@@ -89,6 +89,15 @@
 else
   ifeq ($(CONFIG_FC4),m)
   MOD_SUB_DIRS += fc4
+  endif
+endif
+
+ifeq ($(CONFIG_FUSION),y)
+SUB_DIRS += message/fusion
+MOD_SUB_DIRS += message/fusion
+else
+  ifeq ($(CONFIG_FUSION),m)
+  MOD_SUB_DIRS += message/fusion
   endif
 endif
 
diff -Naur drivers/scsi/hosts.c drivers/scsi/hosts.c
--- drivers/scsi/hosts.c	2000/09/25 17:55:25
+++ drivers/scsi/hosts.c	2000/12/15 01:51:37
@@ -167,6 +167,10 @@
 #include "pas16.h"
 #endif
 
+#ifdef CONFIG_FUSION_BOOT
+#include "../message/fusion/mptscsih.h"
+#endif
+
 #ifdef CONFIG_SCSI_QLOGIC_FAS
 #include "qlogicfas.h"
 #endif
@@ -477,6 +481,9 @@
 #endif
 #ifdef CONFIG_SCSI_SYM53C416 
     SYM53C416, 
+#endif
+#ifdef CONFIG_FUSION_BOOT
+    MPT_SCSIHOST,
 #endif
 #ifdef CONFIG_SCSI_QLOGIC_FAS
     QLOGICFAS,
diff -Naur include/linux/miscdevice.h include/linux/miscdevice.h
--- include/linux/miscdevice.h	2000/03/15 19:22:00
+++ include/linux/miscdevice.h	2000/12/14 13:45:12
@@ -17,6 +17,7 @@
 #define SUN_OPENPROM_MINOR 139
 #define NVRAM_MINOR 144
 #define I2O_MINOR 166
+#define MPT_MINOR 220
 #define MISC_DYNAMIC_MINOR 255
 
 extern int misc_init(void);
diff -Naur include/linux/proc_fs.h include/linux/proc_fs.h
--- include/linux/proc_fs.h	2000/02/23 21:02:27
+++ include/linux/proc_fs.h	2000/12/19 23:52:21
@@ -167,6 +167,7 @@
 	PROC_SCSI_GDTH,
 	PROC_SCSI_GENERIC_NCR5380,
 	PROC_SCSI_IN2000,
+	PROC_SCSI_MPT,
 	PROC_SCSI_PAS16,
 	PROC_SCSI_QLOGICFAS,
 	PROC_SCSI_QLOGICISP,
