Merge branch 'ib/4.10-sparse-keymap-managed' into next

This brings in version of sparse keymap code that uses managed memory.
This commit is contained in:
Dmitry Torokhov
2017-03-09 10:03:22 -08:00
706 changed files with 6900 additions and 4262 deletions

View File

@@ -43,13 +43,20 @@ config RMI4_SMB
config RMI4_F03
bool "RMI4 Function 03 (PS2 Guest)"
depends on SERIO=y || RMI4_CORE=SERIO
depends on RMI4_CORE
help
Say Y here if you want to add support for RMI4 function 03.
Function 03 provides PS2 guest support for RMI4 devices. This
includes support for TrackPoints on TouchPads.
config RMI4_F03_SERIO
tristate
depends on RMI4_CORE
depends on RMI4_F03
default RMI4_CORE
select SERIO
config RMI4_2D_SENSOR
bool