diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index fe0454c84..d91ce595a 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -191,7 +191,6 @@ function in_separate_patch {
 debug_specialize="false"
 enable_specialize="true"
 generating_upstream_patch="false"
-mpt_scst="false"
 multiple_patches="false"
 patchdir=""
 replace_sbug_by_bug="true"
@@ -212,7 +211,6 @@ do
     '-d') debug_specialize="true"; shift;;
     '-h') usage; exit 1;;
     '-l') shift;;
-    '-m') mpt_scst="true"; shift;;
     '-n') specialize_patch_options=(-v "blank_deleted_code=1")
           shift
           ;;
@@ -620,29 +618,6 @@ fi \
 } | process_patch "scst_17_srpt.diff"
 
 
-# Directory drivers/message/fusion/mpt_scst
-
-if [ "$mpt_scst" = "true" ]; then
-
-  (
-  add_patch "mpt/in-tree/Kconfig-2.6.24.diff" "drivers/message/fusion/Kconfig"
-
-  add_patch "mpt/in-tree/Makefile.diff"       "drivers/message/fusion/Makefile"
-
-  add_file  "mpt/in-tree/Makefile" "drivers/message/fusion/mpt_scst/Makefile"
-
-  add_file  "mpt/in-tree/Kconfig"  "drivers/message/fusion/mpt_scst/Kconfig"
-
-  for f in mpt/*.[ch]; do
-    [ -e "$f" ] || continue
-    add_file "${f}" "drivers/message/fusion/mpt_scst/${f#mpt/}"
-  done
-  ) \
-  | process_patch "mpt_scst.diff"
-
-fi
-
-
 # Directory drivers/scst/scst_local
 
 (
diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index 5716503a7..a6ef9818e 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -125,7 +125,7 @@ function make_dpkg {
 
 function compile_scst {
   (
-    for p in scst scst_local iscsi-scst srpt qla2x00t $(if [ "${mpt_scst}" = "true" ]; then echo mpt; fi); do
+    for p in scst scst_local iscsi-scst srpt qla2x00t qla2x00t-32gbit; do
       if [ "${p%qla2x00t}" != "$p" ]; then
         BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y \
         make -C "$p/qla2x00-target" || return $?
@@ -209,7 +209,6 @@ function generate_kernel_patch {
 
   kver="$(kernel_version "${1/^*}")"
   driver_options=(-l)
-  [ "${mpt_scst}" = "true" ] && driver_options+=("-m")
 
   "${scriptsdir}"/generate-kernel-patch "${driver_options[@]}" $2 "$1" > "${patchfile}"
 
@@ -567,7 +566,6 @@ kernel_versions=""
 # an absolute path.
 outputdir="${PWD}/regression-test-output-$(date +%Y-%m-%d_%Hh%Mm%Ss)"
 # Driver configuration.
-mpt_scst="false"
 multiple_patches="false"
 qla2x00t="true"
 remove_temporary_files_at_end="false"