From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 20 Feb 2017 23:16:02 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: Ubuntu-5.13.0-19.19~14002^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6e11617fcff3688f70650a3e40addb0043dda137;p=mirror_ubuntu-jammy-kernel.git

Merge branch 'next' into for-linus

Prepare input updates for 4.11 merge window.
---

6e11617fcff3688f70650a3e40addb0043dda137
diff --cc drivers/input/rmi4/Kconfig
index bb7762bf2879,78a78b99ec31..7172b88cd064
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@@ -40,24 -42,16 +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)"