ukui/kernel
0
0
Fork 0
mirror of https://github.com/ukui/kernel.git synced 2026-03-09 10:07:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.0-rc5' into next

Browse Source 
Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.

Conflicts:
	drivers/input/mouse/synaptics.c
This commit is contained in:
Dmitry Torokhov
2015-03-23 09:18:27 -07:00
parent 4ed0e032c3 bc465aa9d0
commit 188933ac13
8770 changed files with 373390 additions and 200060 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/touchscreen/Kconfig
+1
View File
@@ -944,6 +944,7 @@ config TOUCHSCREEN_SUN4I
tristate "Allwinner sun4i resistive touchscreen controller support"
depends on ARCH_SUNXI || COMPILE_TEST
depends on HWMON
depends on THERMAL || !THERMAL_OF
help
This selects support for the resistive touchscreen controller
found on Allwinner sunxi SoCs.