[linux] 01/04: [armel/kirkwood] udeb: Override inclusion of gpio_keys in input-modules (fixes FTBFS)

[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 79e8696482bdb401e3106f4e3228e7094685de90
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Dec 15 02:03:43 2015 +0000

    [armel/kirkwood] udeb: Override inclusion of gpio_keys in input-modules (fixes FTBFS)
---
 debian/changelog                                            | 2 ++
 debian/installer/armel/modules/armel-kirkwood/input-modules | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 02620cd..8291d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 linux (4.3.1-2) UNRELEASED; urgency=medium
 
   * net: add validation for the socket syscall protocol argument (CVE-2015-8543)
+  * [armel/kirkwood] udeb: Override inclusion of gpio_keys in input-modules
+    (fixes FTBFS)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Dec 2015 20:59:37 +0000
 
diff --git a/debian/installer/armel/modules/armel-kirkwood/input-modules b/debian/installer/armel/modules/armel-kirkwood/input-modules
index 5ecb595..3418358 100644
--- a/debian/installer/armel/modules/armel-kirkwood/input-modules
+++ b/debian/installer/armel/modules/armel-kirkwood/input-modules
@@ -1 +1,3 @@
 #include <input-modules>
+# Moved to event-modules for use in network-console builds
+gpio_keys -

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