diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 b/qla2x00t/qla2x00-target/Makefile_in-tree similarity index 100% rename from qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35 rename to qla2x00t/qla2x00-target/Makefile_in-tree diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.36 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.37 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.38 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.39 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.0 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.1 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.10 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.11 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.12 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.13 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.14 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.15 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.16 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.17 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.18 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.19 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.2 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.3 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.4 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.5 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.6 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.7 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.8 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 b/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-3.9 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.0 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.1 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.2 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.3 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.4 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.5 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 deleted file mode 100644 index 9657aee84..000000000 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.6 +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -Idrivers/scsi/qla2xxx - -qla2x00tgt-y := qla2x00t.o - -obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 7fd772da8..d8c15a34a 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -517,8 +517,14 @@ if [ "${qla2x00t}" = "true" ]; then add_file "qla2x00t/qla2x_tgt_def.h" \ "drivers/scsi/qla2xxx/qla2x_tgt_def.h" - add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ + if [ -e "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" ] + then + add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ "drivers/scst/qla2xxx-target/Makefile" + else + add_file "qla2x00t/qla2x00-target/Makefile_in-tree" \ + "drivers/scst/qla2xxx-target/Makefile" + fi add_file "qla2x00t/qla2x00-target/Kconfig" \ "drivers/scst/qla2xxx-target/Kconfig"