[linux] 06/13: [x86] input: Enable MOUSE_ELAN_I2C etc. (Closes: #791631)

[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 748e8a1e0d736a56ca17737810037d73a973e0d6
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 12 16:28:51 2015 +0000

    [x86] input: Enable MOUSE_ELAN_I2C etc. (Closes: #791631)
    
    (cherry picked from commit b7cb1cceca3705bca91c35d1aeb44de00ea04736)
---
 debian/changelog                    | 2 ++
 debian/config/kernelarch-x86/config | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ce772e6..ae048fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ linux (4.2.6-2) UNRELEASED; urgency=medium
   * qxl: Enable by default (Closes: #779515)
   * [s390*] Update linux-compiler metapackage to gcc-4.9
   * firmware_class: Fix condition in directory search loop (Closes: #804862)
+  * [x86] input: Enable MOUSE_ELAN_I2C as module, MOUSE_ELAN_I2C_I2C and
+    MOUSE_ELAN_I2C_SMBUS (Closes: #791631)
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 10 Nov 2015 22:05:58 +0100
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 329d768..4cf2963 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -733,6 +733,9 @@ CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
 CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
 CONFIG_MOUSE_VSXXXAA=m
 
 ##

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