aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2015-09-27 20:57:02 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-09-27 21:02:51 +0100
commit9214813ef3b8892dc2973ba66d38c8599c3df27e (patch)
tree0d9dd88712953b8a2e00142d912a67ac236b0946
parent297b345f7c0840114ca911cf1c1f7f5bddca00d2 (diff)
downloadkernel_replicant_linux-9214813ef3b8892dc2973ba66d38c8599c3df27e.tar.gz
kernel_replicant_linux-9214813ef3b8892dc2973ba66d38c8599c3df27e.tar.bz2
kernel_replicant_linux-9214813ef3b8892dc2973ba66d38c8599c3df27e.zip
SCSI: Set SCSI_DH=y, as it's now a bool option for the SCSI core
udeb: Remove scsi_dh from scsi-core-modules
-rw-r--r--debian/config/config2
-rw-r--r--debian/installer/modules/scsi-core-modules1
-rw-r--r--debian/installer/sh4/modules/sh4-sh7751r/scsi-core-modules1
-rw-r--r--debian/installer/sh4/modules/sh4-sh7785lcr/scsi-core-modules1
4 files changed, 1 insertions, 4 deletions
diff --git a/debian/config/config b/debian/config/config
index 1ebb0e8fe14e..0c22f3d788ff 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3686,7 +3686,7 @@ CONFIG_SCSI_CXGB4_ISCSI=m
##
## file: drivers/scsi/device_handler/Kconfig
##
-CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH=y
CONFIG_SCSI_DH_RDAC=m
CONFIG_SCSI_DH_HP_SW=m
CONFIG_SCSI_DH_EMC=m
diff --git a/debian/installer/modules/scsi-core-modules b/debian/installer/modules/scsi-core-modules
index bc3f355bc897..e0d1d8fca1ed 100644
--- a/debian/installer/modules/scsi-core-modules
+++ b/debian/installer/modules/scsi-core-modules
@@ -1,4 +1,3 @@
-scsi_dh
scsi_mod
sd_mod
scsi_transport_sas ?
diff --git a/debian/installer/sh4/modules/sh4-sh7751r/scsi-core-modules b/debian/installer/sh4/modules/sh4-sh7751r/scsi-core-modules
deleted file mode 100644
index 1fde8eedc2e0..000000000000
--- a/debian/installer/sh4/modules/sh4-sh7751r/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-scsi_dh
diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/scsi-core-modules b/debian/installer/sh4/modules/sh4-sh7785lcr/scsi-core-modules
deleted file mode 100644
index 1fde8eedc2e0..000000000000
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-scsi_dh