Index: Makefile
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/Makefile,v
retrieving revision 1.1.1.1.2.10
retrieving revision 1.2.2.26
diff -u -r1.1.1.1.2.10 -r1.2.2.26
--- Makefile	2000/12/14 00:19:55	1.1.1.1.2.10
+++ Makefile	2000/12/14 18:19:19	1.2.2.26
@@ -134,6 +134,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.7
retrieving revision 1.1.6.8
diff -u -r1.1.2.7 -r1.1.6.8
--- arch/alpha/config.in	2000/12/14 00:20:05	1.1.2.7
+++ arch/alpha/config.in	2000/12/14 05:13:23	1.1.6.8
@@ -236,6 +236,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.7
retrieving revision 1.1.2.8
diff -u -r1.1.1.5.2.7 -r1.1.2.8
--- arch/i386/config.in	2000/12/14 00:20:06	1.1.1.5.2.7
+++ arch/i386/config.in	2000/12/14 00:32:30	1.1.2.8
@@ -141,6 +141,8 @@
 fi
 endmenu
 
+source drivers/message/fusion/Config.in
+
 source drivers/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
Index: arch/sparc64/config.in
===================================================================
RCS file: /home/fibre/cvs_master/mptlinux/arch/sparc64/config.in,v
retrieving revision 1.1.1.5.4.4
retrieving revision 1.1.4.9
diff -u -r1.1.1.5.4.4 -r1.1.4.9
--- arch/sparc64/config.in	2000/12/14 00:20:07	1.1.1.5.4.4
+++ arch/sparc64/config.in	2000/12/14 00:32:31	1.1.4.9
@@ -217,6 +217,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.5
retrieving revision 1.1.2.6
diff -u -r1.1.1.2.6.5 -r1.1.2.6
--- drivers/Makefile	2000/12/14 00:20:09	1.1.1.2.6.5
+++ drivers/Makefile	2000/12/14 00:32:33	1.1.2.6
@@ -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 nubus usb telephony i2o
+				macintosh video dio zorro fc4 \
+				nubus usb telephony i2o message/fusion
 
 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.6
retrieving revision 1.1.2.9
diff -u -r1.1.1.1.2.6 -r1.1.2.9
--- drivers/scsi/hosts.c	2000/12/14 00:20:13	1.1.1.1.2.6
+++ drivers/scsi/hosts.c	2000/12/15 02:07:31	1.1.2.9
@@ -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
@@ -519,6 +523,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
@@ -18,6 +18,7 @@
 #define NVRAM_MINOR 144
 #define I2O_MINOR 166
 #define MICROCODE_MINOR 184
+#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.7
retrieving revision 1.1.2.11
diff -u -r1.1.1.2.2.7 -r1.1.2.11
--- include/linux/proc_fs.h	2000/12/14 00:20:18	1.1.1.2.2.7
+++ include/linux/proc_fs.h	2000/12/20 00:04:45	1.1.2.11
@@ -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,
