summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2015-11-12 16:28:51 +0000
committerBen Hutchings <ben@decadent.org.uk>2015-12-04 01:16:41 +0000
commit748e8a1e0d736a56ca17737810037d73a973e0d6 (patch)
tree7a86c43497f66e9e1f2edd007cc3f2b2024a0d1a
parent7d0a4425fdaf5b52de52b6a1180906fa342d0b4f (diff)
[x86] input: Enable MOUSE_ELAN_I2C etc. (Closes: #791631)
(cherry picked from commit b7cb1cceca3705bca91c35d1aeb44de00ea04736)
-rw-r--r--debian/changelog2
-rw-r--r--debian/config/kernelarch-x86/config3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ce772e65d..ae048fc1f 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@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 329d76849..4cf296311 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
##