[linux] 02/05: [i386] udeb: Make gpio_keys_polled and leds-gpio optional in input-modules

[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 f26069abfa832669ffba90fc33eb4b005340a8cb
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 22 19:00:30 2015 +0200

    [i386] udeb: Make gpio_keys_polled and leds-gpio optional in input-modules
    
    They are not built for the 686-pae flavour, only 586.
    Fixes FTBFS.
---
 debian/changelog                                 | 5 +++++
 debian/installer/i386/modules/i386/input-modules | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9a0e57..a838e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 linux (4.1.5-2) UNRELEASED; urgency=medium
 
+  [ Aurelien Jarno ]
   * [mips*] Build ext4 as module. Add core-modules and ext4-modules udeb.
     Fixes FTBFS.
 
+  [ Ben Hutchings ]
+  * [i386] udeb: Make gpio_keys_polled and leds-gpio optional in input-modules
+    as they are not built for the 686-pae flavour (fixes FTBFS)
+
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 18 Aug 2015 11:35:05 +0200
 
 linux (4.1.5-1) unstable; urgency=medium
diff --git a/debian/installer/i386/modules/i386/input-modules b/debian/installer/i386/modules/i386/input-modules
index b12d1f5..cdba2e4 100644
--- a/debian/installer/i386/modules/i386/input-modules
+++ b/debian/installer/i386/modules/i386/input-modules
@@ -1,4 +1,5 @@
 #include <input-modules>
 # Needed on some Geode LX boards - Alix2/3/6, Soekris net5501, Traverse GEOS
-gpio_keys_polled
-leds-gpio
+# so only built for 586 flavour
+gpio_keys_polled ?
+leds-gpio ?

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