[linux] 01/02: udeb: Make DAC960 and cciss optional in scsi-modules again

[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 71665302adb59f0e7887dfa7fb0a936fc657ccad
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Feb 18 16:43:36 2016 +0000

    udeb: Make DAC960 and cciss optional in scsi-modules again
    
    They are only built on some architectures, but armhf and arm64 #include
    this file so currently FTBFS.
---
 debian/changelog                      | 7 +++++++
 debian/installer/modules/scsi-modules | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d479467..8ca5a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.4.2-2) UNRELEASED; urgency=medium
+
+  * udeb: Make DAC960 and cciss optional in scsi-modules again
+    (fixes FTBFS on armhf, arm64)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 18 Feb 2016 16:43:30 +0000
+
 linux (4.4.2-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules
index 4a5a3db..577914a 100644
--- a/debian/installer/modules/scsi-modules
+++ b/debian/installer/modules/scsi-modules
@@ -1,7 +1,7 @@
 # Include SCSI controller drivers by default
 drivers/scsi/**
-DAC960
-cciss
+DAC960 ?
+cciss ?
 mptfc
 mptsas
 mptspi

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