[linux] 01/02: SCSI: Set SCSI_DH=y, as it's now a bool option for the SCSI core

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 9214813ef3b8892dc2973ba66d38c8599c3df27e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Sep 27 20:57:02 2015 +0100

    SCSI: Set SCSI_DH=y, as it's now a bool option for the SCSI core
    
    udeb: Remove scsi_dh from scsi-core-modules
---
 debian/config/config                                         | 2 +-
 debian/installer/modules/scsi-core-modules                   | 1 -
 debian/installer/sh4/modules/sh4-sh7751r/scsi-core-modules   | 1 -
 debian/installer/sh4/modules/sh4-sh7785lcr/scsi-core-modules | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/config/config b/debian/config/config
index 1ebb0e8..0c22f3d 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 bc3f355..e0d1d8f 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 1fde8ee..0000000
--- 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 1fde8ee..0000000
--- a/debian/installer/sh4/modules/sh4-sh7785lcr/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-scsi_dh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git