diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-12 16:43:48 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-12-04 01:17:20 +0000 |
| commit | fe21430e13fcea09dc1867d89f40ba879612af9f (patch) | |
| tree | 1540040c646d4fd77e9e2281376ba14cce47a516 | |
| parent | 33e97ce9dac6135f491c9041a56ac7d8d5b08ded (diff) | |
[x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929)
linux-image: Add versioned Breaks on xserver-xorg-input-vmmouse to avoid
driver conflicts
(cherry picked from commit cdec8195c20d29429922fbb873009be932dea874)
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/amd64/defines | 1 | ||||
| -rw-r--r-- | debian/config/i386/defines | 1 | ||||
| -rw-r--r-- | debian/config/kernelarch-x86/config | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b15620f58..e41845c95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ linux (4.2.6-2) UNRELEASED; urgency=medium MOUSE_ELAN_I2C_SMBUS (Closes: #791631) * [armhf] hsi: Enable CMT_SPEECH as module (Closes: #791819) * [armhf] power: Enable BATTERY_RX51 as module (Closes: #791820) + * [x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929) + - linux-image: Add versioned Breaks on xserver-xorg-input-vmmouse to + avoid driver conflicts -- Salvatore Bonaccorso <carnil@debian.org> Tue, 10 Nov 2015 22:05:58 +0100 diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index ea197ee68..933bed460 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -12,6 +12,7 @@ image-file: arch/x86/boot/bzImage bootloaders: grub-pc grub-efi extlinux configs: install-stem: vmlinuz +breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99) [relations] headers%gcc-4.9: linux-compiler-gcc-4.9-x86 diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 20dc64446..ed1b05fa9 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -17,6 +17,7 @@ part-long-pae: This kernel requires PAE (Physical Address Extension). bootloaders: grub-pc extlinux configs: install-stem: vmlinuz +breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99) [relations] headers%gcc-4.9: linux-compiler-gcc-4.9-x86 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 4cf296311..31a4163ba 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -727,8 +727,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m ## CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m -#. Must not enable this until xserver-xorg-input-vmmouse is upgraded -# CONFIG_MOUSE_PS2_VMMOUSE is not set +CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m |