Index: Makefile
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/Makefile,v
retrieving revision 1.1.1.1.2.8.2.1
retrieving revision 1.2.2.24
diff -u -r1.1.1.1.2.8.2.1 -r1.2.2.24
--- Makefile	2000/11/21 13:24:05	1.1.1.1.2.8.2.1
+++ Makefile	2000/12/14 18:17:36	1.2.2.24
@@ -126,6 +126,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
Index: arch/i386/config.in
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/arch/i386/config.in,v
retrieving revision 1.1.1.5.2.5.2.1
retrieving revision 1.1.2.5.2.1
diff -u -r1.1.1.5.2.5.2.1 -r1.1.2.5.2.1
--- arch/i386/config.in	2000/11/21 13:24:14	1.1.1.5.2.5.2.1
+++ arch/i386/config.in	2000/11/21 13:33:42	1.1.2.5.2.1
@@ -126,6 +126,8 @@
   source net/Config.in
 fi
 
+source drivers/message/fusion/Config.in
+
 source drivers/telephony/Config.in
 
 mainmenu_option next_comment
Index: drivers/Makefile
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/drivers/Makefile,v
retrieving revision 1.1.1.2.6.4.2.1
retrieving revision 1.1.2.5.2.1
diff -u -r1.1.1.2.6.4.2.1 -r1.1.2.5.2.1
--- drivers/Makefile	2000/11/21 13:24:15	1.1.1.2.6.4.2.1
+++ drivers/Makefile	2000/11/21 13:33:43	1.1.2.5.2.1
@@ -10,7 +10,8 @@
 SUB_DIRS     := block char net misc sound
 MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi sbus cdrom isdn pnp \
-				macintosh video dio zorro fc4 usb telephony i2o i2c sensors
+				macintosh video dio zorro fc4 usb telephony \
+				i2o message/fusion i2c sensors
 
 ifdef CONFIG_DIO
 SUB_DIRS += dio
@@ -125,6 +126,15 @@
 else
   ifeq ($(CONFIG_I2O),m)
   MOD_SUB_DIRS += i2o
+  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
 
Index: drivers/scsi/hosts.c
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/drivers/scsi/hosts.c,v
retrieving revision 1.1.1.1.2.4.2.1
retrieving revision 1.1.2.7
diff -u -r1.1.1.1.2.4.2.1 -r1.1.2.7
--- drivers/scsi/hosts.c	2000/11/21 13:24:22	1.1.1.1.2.4.2.1
+++ drivers/scsi/hosts.c	2000/12/15 02:06:03	1.1.2.7
@@ -179,6 +179,10 @@
 #include "pas16.h"
 #endif
 
+#ifdef CONFIG_FUSION_BOOT
+#include "../message/fusion/mptscsih.h"
+#endif
+
 #ifdef CONFIG_SCSI_QLOGIC_FAS
 #include "qlogicfas.h"
 #endif
@@ -523,6 +527,9 @@
 #endif
 #ifdef CONFIG_SCSI_SYM53C416 
     SYM53C416, 
+#endif
+#ifdef CONFIG_FUSION_BOOT
+    MPT_SCSIHOST,
 #endif
 #ifdef CONFIG_SCSI_QLOGIC_FAS
     QLOGICFAS,
Index: include/linux/miscdevice.h
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/include/linux/miscdevice.h,v
retrieving revision 1.1.1.3.2.2
retrieving revision 1.1.4.2
diff -u -r1.1.1.3.2.2 -r1.1.4.2
--- include/linux/miscdevice.h	2000/03/15 19:23:47	1.1.1.3.2.2
+++ include/linux/miscdevice.h	2000/12/14 13:47:50	1.1.4.2
@@ -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
 
 #define SGI_GRAPHICS_MINOR   146
Index: include/linux/proc_fs.h
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/include/linux/proc_fs.h,v
retrieving revision 1.1.1.2.2.6.2.1
retrieving revision 1.1.2.9
diff -u -r1.1.1.2.2.6.2.1 -r1.1.2.9
--- include/linux/proc_fs.h	2000/11/21 13:24:26	1.1.1.2.2.6.2.1
+++ include/linux/proc_fs.h	2000/12/20 00:03:00	1.1.2.9
@@ -168,6 +168,7 @@
 	PROC_SCSI_GDTH,
 	PROC_SCSI_GENERIC_NCR5380,
 	PROC_SCSI_IN2000,
+	PROC_SCSI_MPT,
 	PROC_SCSI_PAS16,
 	PROC_SCSI_QLOGICFAS,
 	PROC_SCSI_QLOGICISP,
