From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 9 Mar 2017 18:03:22 +0000 (-0800)
Subject: Merge branch 'ib/4.10-sparse-keymap-managed' into next
X-Git-Tag: v4.14-rc1~4^2~36^2~123
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b179e251ba089898b4e8e6d065be8ae2c0a4a3e;p=platform%2Fkernel%2Flinux-rpi.git

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

This brings in version of sparse keymap code that uses managed memory.
---

7b179e251ba089898b4e8e6d065be8ae2c0a4a3e
diff --cc drivers/input/rmi4/Kconfig
index 78a78b9,bb7762b..7172b88
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@@ -42,16 -40,24 +42,23 @@@ config RMI4_SM
  	  called rmi_smbus.
  
  config RMI4_F03
 -        bool "RMI4 Function 03 (PS2 Guest)"
 +	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.
 +	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.
 +	  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
 -	depends on RMI4_CORE
  
  config RMI4_F11
  	bool "RMI4 Function 11 (2D pointing)"