21 files changed, 0 insertions, 39 deletions
diff --git a/baseconfig/CONFIG_BLK_CPQ_CISS_DA b/baseconfig/CONFIG_BLK_CPQ_CISS_DA
deleted file mode 100644
index be7870097..000000000
--- a/baseconfig/CONFIG_BLK_CPQ_CISS_DA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BLK_CPQ_CISS_DA=m
diff --git a/baseconfig/CONFIG_CISS_SCSI_TAPE b/baseconfig/CONFIG_CISS_SCSI_TAPE
deleted file mode 100644
index 2170cc840..000000000
--- a/baseconfig/CONFIG_CISS_SCSI_TAPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CISS_SCSI_TAPE=y
diff --git a/baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA b/baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA
deleted file mode 100644
index 2e6c723ac..000000000
--- a/baseconfig/s390x/CONFIG_BLK_CPQ_CISS_DA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_CPQ_CISS_DA is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 5467a4cae..223b27246 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -523,7 +523,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -850,7 +849,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 CONFIG_CLKDEV_LOOKUP=y
 # CONFIG_CLK_HSDK is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 7c2905482..3b6e12985 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -523,7 +523,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -850,7 +849,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 CONFIG_CLKDEV_LOOKUP=y
 # CONFIG_CLK_HSDK is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 849b405c0..c8c7d64a0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -564,7 +564,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -895,7 +894,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 26a4b403b..d12adfb78 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -540,7 +540,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -867,7 +866,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index a07d7d895..40d22eac0 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -539,7 +539,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -866,7 +865,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 1bb1eb13e..97e5f51c7 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -563,7 +563,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -894,7 +893,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 448e50b95..15d453c14 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -433,7 +433,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_AMD74XX=y
@@ -748,7 +747,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 05f6fbb92..c1088ee60 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -434,7 +434,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_AMD74XX=y
@@ -749,7 +748,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 3f4f97aae..c3743d60c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -434,7 +434,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_AMD74XX=y
@@ -749,7 +748,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 60c44d775..2805e9354 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -433,7 +433,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_AMD74XX=y
@@ -748,7 +747,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3cba55ab3..54081d19d 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -380,7 +380,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 # CONFIG_BLK_DEV_AEC62XX is not set
@@ -732,7 +731,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index ca6e6ad34..7ea765679 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -379,7 +379,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 # CONFIG_BLK_DEV_AEC62XX is not set
@@ -731,7 +730,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a1a713ba9..85b2347b2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -373,7 +373,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_BSGLIB=y
@@ -688,7 +687,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e1c1532a3..c12b67f58 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -372,7 +372,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_BSGLIB=y
@@ -687,7 +686,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a4908320b..917bde643 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -375,7 +375,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -690,7 +689,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1b3156a08..0f2556742 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -374,7 +374,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -689,7 +688,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index f8f785360..f3a380f12 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -440,7 +440,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_AMD74XX=y
@@ -763,7 +762,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index e26090f5b..2e278492f 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -439,7 +439,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_AMD74XX=y
@@ -762,7 +761,6 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set