diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index d8c15a34a..78bcba0cf 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -413,10 +413,16 @@ done
 
 
 # Directory drivers/scst/dev_handlers/
-
-add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \
-         "drivers/scst/dev_handlers/Makefile" \
-| process_patch "scst_11_dev_handlers_makefile.diff"
+if [ -e "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" ]
+then
+  add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \
+           "drivers/scst/dev_handlers/Makefile" \
+  | process_patch "scst_11_dev_handlers_makefile.diff"
+else
+  add_file "scst/kernel/in-tree/Makefile.dev_handlers" \
+           "drivers/scst/dev_handlers/Makefile" \
+  | process_patch "scst_11_dev_handlers_makefile.diff"
+fi
 
 for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null)
 do
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 b/scst/kernel/in-tree/Makefile.dev_handlers
similarity index 100%
rename from scst/kernel/in-tree/Makefile.dev_handlers-2.6.35
rename to scst/kernel/in-tree/Makefile.dev_handlers
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.36
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.37
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.38
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.39
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.0 b/scst/kernel/in-tree/Makefile.dev_handlers-3.0
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.1 b/scst/kernel/in-tree/Makefile.dev_handlers-3.1
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.10 b/scst/kernel/in-tree/Makefile.dev_handlers-3.10
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.10
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.11 b/scst/kernel/in-tree/Makefile.dev_handlers-3.11
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.11
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.12 b/scst/kernel/in-tree/Makefile.dev_handlers-3.12
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.12
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.13 b/scst/kernel/in-tree/Makefile.dev_handlers-3.13
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.13
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.14 b/scst/kernel/in-tree/Makefile.dev_handlers-3.14
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.14
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.15 b/scst/kernel/in-tree/Makefile.dev_handlers-3.15
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.15
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.16 b/scst/kernel/in-tree/Makefile.dev_handlers-3.16
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.16
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.17 b/scst/kernel/in-tree/Makefile.dev_handlers-3.17
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.17
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.18 b/scst/kernel/in-tree/Makefile.dev_handlers-3.18
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.18
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.19 b/scst/kernel/in-tree/Makefile.dev_handlers-3.19
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.19
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.2 b/scst/kernel/in-tree/Makefile.dev_handlers-3.2
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.3 b/scst/kernel/in-tree/Makefile.dev_handlers-3.3
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.4 b/scst/kernel/in-tree/Makefile.dev_handlers-3.4
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.5 b/scst/kernel/in-tree/Makefile.dev_handlers-3.5
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.6 b/scst/kernel/in-tree/Makefile.dev_handlers-3.6
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.7 b/scst/kernel/in-tree/Makefile.dev_handlers-3.7
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.8 b/scst/kernel/in-tree/Makefile.dev_handlers-3.8
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-3.9 b/scst/kernel/in-tree/Makefile.dev_handlers-3.9
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.0 b/scst/kernel/in-tree/Makefile.dev_handlers-4.0
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.1 b/scst/kernel/in-tree/Makefile.dev_handlers-4.1
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.2 b/scst/kernel/in-tree/Makefile.dev_handlers-4.2
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.3 b/scst/kernel/in-tree/Makefile.dev_handlers-4.3
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.4 b/scst/kernel/in-tree/Makefile.dev_handlers-4.4
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.5 b/scst/kernel/in-tree/Makefile.dev_handlers-4.5
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.6 b/scst/kernel/in-tree/Makefile.dev_handlers-4.6
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o