[linux] 01/01: udeb: Include all AHCI drivers in sata-modules (Closes: #860335)

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit 9cb1bd16f9b237b1e4486e5e710d8e7bfd0e7a5c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Apr 14 20:35:35 2017 +0100

    udeb: Include all AHCI drivers in sata-modules (Closes: #860335)
---
 debian/changelog                                        | 1 +
 debian/installer/arm64/modules/arm64/sata-modules       | 3 ---
 debian/installer/armhf/modules/armhf-armmp/sata-modules | 4 ----
 debian/installer/mips/modules/mips-octeon/sata-modules  | 2 --
 debian/installer/modules/sata-modules                   | 3 ++-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5f3d10..08df9e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
   * [powerpc/powerpc64,ppc64*] target: Enable SCSI_IBMVSCSIS as module
   * cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
     (Closes: #859978)
+  * udeb: Include all AHCI drivers in sata-modules (Closes: #860335)
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/installer/arm64/modules/arm64/sata-modules b/debian/installer/arm64/modules/arm64/sata-modules
index 312af7b..740a93c 100644
--- a/debian/installer/arm64/modules/arm64/sata-modules
+++ b/debian/installer/arm64/modules/arm64/sata-modules
@@ -1,7 +1,4 @@
 #include <sata-modules>
-ahci_platform
-ahci_tegra
-ahci_xgene
 phy-qcom-apq8064-sata
 phy-qcom-ipq806x-sata
 phy-xgene
diff --git a/debian/installer/armhf/modules/armhf-armmp/sata-modules b/debian/installer/armhf/modules/armhf-armmp/sata-modules
index 70d5e36..8e7e1ed 100644
--- a/debian/installer/armhf/modules/armhf-armmp/sata-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/sata-modules
@@ -1,8 +1,4 @@
 #include <sata-modules>
-ahci_platform
-ahci_imx
-ahci_sunxi
-ahci_tegra
 sata_highbank
 
 # SATA PHYs
diff --git a/debian/installer/mips/modules/mips-octeon/sata-modules b/debian/installer/mips/modules/mips-octeon/sata-modules
index 87cdd41..01318c2 100644
--- a/debian/installer/mips/modules/mips-octeon/sata-modules
+++ b/debian/installer/mips/modules/mips-octeon/sata-modules
@@ -1,3 +1 @@
 #include <sata-modules>
-ahci_platform
-ahci_octeon
diff --git a/debian/installer/modules/sata-modules b/debian/installer/modules/sata-modules
index e5043ad..e3be90b 100644
--- a/debian/installer/modules/sata-modules
+++ b/debian/installer/modules/sata-modules
@@ -1,12 +1,13 @@
 # Include SATA drivers by default
+drivers/ata/ahci* ?
 drivers/ata/sata_*
 
 # sata-sis depends on pata-sis; avoid a dependency
 pata_sis ?
 
 # Include more SATA drivers with unusual names
+acard-ahci ?
 ata_piix ?
-ahci ?
 sx8 ?
 pdc_adma ?
 mtip32xx ?

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