Index: Makefile
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/Makefile,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.2.2.19
diff -u -r1.1.1.1.2.6 -r1.2.2.19
--- Makefile	2000/02/23 22:37:04	1.1.1.1.2.6
+++ Makefile	2000/12/14 18:12:58	1.2.2.19
@@ -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/alpha/config.in
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/arch/alpha/config.in,v
retrieving revision 1.1.2.3
retrieving revision 1.1.6.4
diff -u -r1.1.2.3 -r1.1.6.4
--- arch/alpha/config.in	2000/12/13 11:26:40	1.1.2.3
+++ arch/alpha/config.in	2000/12/14 05:06:19	1.1.6.4
@@ -228,6 +228,8 @@
 fi
 endmenu
 
+source drivers/message/fusion/Config.in
+
 if [ "$CONFIG_NET" = "y" ]; then
   mainmenu_option next_comment
   comment 'Network device support'
Index: arch/i386/config.in
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/arch/i386/config.in,v
retrieving revision 1.1.1.5.2.3
retrieving revision 1.1.2.3
diff -u -r1.1.1.5.2.3 -r1.1.2.3
--- arch/i386/config.in	2000/02/23 22:37:08	1.1.1.5.2.3
+++ arch/i386/config.in	2000/10/01 18:55:04	1.1.2.3
@@ -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: arch/sparc64/config.in
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/arch/sparc64/config.in,v
retrieving revision 1.1.1.5
retrieving revision 1.1.4.5
diff -u -r1.1.1.5 -r1.1.4.5
--- arch/sparc64/config.in	2000/05/05 17:00:32	1.1.1.5
+++ arch/sparc64/config.in	2000/10/01 19:09:36	1.1.4.5
@@ -189,6 +189,8 @@
 fi
 endmenu
 
+source drivers/message/fusion/Config.in
+
 source drivers/fc4/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
Index: drivers/Makefile
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/drivers/Makefile,v
retrieving revision 1.1.1.2.6.3
retrieving revision 1.1.2.3.4.1
diff -u -r1.1.1.2.6.3 -r1.1.2.3.4.1
--- drivers/Makefile	2000/02/23 22:37:13	1.1.1.2.6.3
+++ drivers/Makefile	2000/12/02 06:54:04	1.1.2.3.4.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
+				macintosh video dio zorro fc4 usb telephony \
+				message/fusion
 
 ifdef CONFIG_DIO
 SUB_DIRS += dio
@@ -116,6 +117,15 @@
 else
   ifeq ($(CONFIG_PHONE),m)
   MOD_SUB_DIRS += telephony
+  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.3
retrieving revision 1.1.2.5
diff -u -r1.1.1.1.2.3 -r1.1.2.5
--- drivers/scsi/hosts.c	2000/09/26 15:47:14	1.1.1.1.2.3
+++ drivers/scsi/hosts.c	2000/12/15 01:55:48	1.1.2.5
@@ -175,6 +175,10 @@
 #include "pas16.h"
 #endif
 
+#ifdef CONFIG_FUSION_BOOT
+#include "../message/fusion/mptscsih.h"
+#endif
+
 #ifdef CONFIG_SCSI_QLOGIC_FAS
 #include "qlogicfas.h"
 #endif
@@ -499,6 +503,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.4
retrieving revision 1.1.2.6
diff -u -r1.1.1.2.2.4 -r1.1.2.6
--- include/linux/proc_fs.h	2000/02/23 22:37:24	1.1.1.2.2.4
+++ include/linux/proc_fs.h	2000/12/19 23:59:18	1.1.2.6
@@ -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,
