[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 cdec8195c2
)
This commit is contained in:
parent
33e97ce9da
commit
fe21430e13
|
@ -26,6 +26,9 @@ linux (4.2.6-2) UNRELEASED; urgency=medium
|
||||||
MOUSE_ELAN_I2C_SMBUS (Closes: #791631)
|
MOUSE_ELAN_I2C_SMBUS (Closes: #791631)
|
||||||
* [armhf] hsi: Enable CMT_SPEECH as module (Closes: #791819)
|
* [armhf] hsi: Enable CMT_SPEECH as module (Closes: #791819)
|
||||||
* [armhf] power: Enable BATTERY_RX51 as module (Closes: #791820)
|
* [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
|
-- Salvatore Bonaccorso <carnil@debian.org> Tue, 10 Nov 2015 22:05:58 +0100
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ image-file: arch/x86/boot/bzImage
|
||||||
bootloaders: grub-pc grub-efi extlinux
|
bootloaders: grub-pc grub-efi extlinux
|
||||||
configs:
|
configs:
|
||||||
install-stem: vmlinuz
|
install-stem: vmlinuz
|
||||||
|
breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
|
||||||
|
|
||||||
[relations]
|
[relations]
|
||||||
headers%gcc-4.9: linux-compiler-gcc-4.9-x86
|
headers%gcc-4.9: linux-compiler-gcc-4.9-x86
|
||||||
|
|
|
@ -17,6 +17,7 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
|
||||||
bootloaders: grub-pc extlinux
|
bootloaders: grub-pc extlinux
|
||||||
configs:
|
configs:
|
||||||
install-stem: vmlinuz
|
install-stem: vmlinuz
|
||||||
|
breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
|
||||||
|
|
||||||
[relations]
|
[relations]
|
||||||
headers%gcc-4.9: linux-compiler-gcc-4.9-x86
|
headers%gcc-4.9: linux-compiler-gcc-4.9-x86
|
||||||
|
|
|
@ -727,8 +727,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
|
||||||
##
|
##
|
||||||
CONFIG_INPUT_MOUSE=y
|
CONFIG_INPUT_MOUSE=y
|
||||||
CONFIG_MOUSE_PS2=m
|
CONFIG_MOUSE_PS2=m
|
||||||
#. Must not enable this until xserver-xorg-input-vmmouse is upgraded
|
CONFIG_MOUSE_PS2_VMMOUSE=y
|
||||||
# CONFIG_MOUSE_PS2_VMMOUSE is not set
|
|
||||||
CONFIG_MOUSE_SERIAL=m
|
CONFIG_MOUSE_SERIAL=m
|
||||||
CONFIG_MOUSE_APPLETOUCH=m
|
CONFIG_MOUSE_APPLETOUCH=m
|
||||||
CONFIG_MOUSE_BCM5974=m
|
CONFIG_MOUSE_BCM5974=m
|
||||||
|
|
Loading…
Reference in New Issue