From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Wed, 5 Oct 2022 09:31:33 +0000 (+0100)
Subject: Merge branch 'for-6.1/rc-controllers' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d7ae8ff97e6243c09ac4ab8d737504224bd3475c;p=linux.git

Merge branch 'for-6.1/rc-controllers' into for-linus

- Support for various RC controllers (Marcus Folkesson)
---

d7ae8ff97e6243c09ac4ab8d737504224bd3475c
diff --cc drivers/hid/Kconfig
index b2ab14d27640f,4cdc44da2abf1..b9adf714db357
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -454,8 -480,20 +454,18 @@@ config HID_VIEWSONI
  	help
  	  Support for ViewSonic/Signotec PD1011 signature pad.
  
+ config HID_VRC2
+ 	tristate "VRC-2 Car Controller"
+ 	depends on HID
+ 	help
+         Support for VRC-2 which is a 2-axis controller often used in
+         car simulators.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called hid-vrc2.
+ 
  config HID_XIAOMI
  	tristate "Xiaomi"
 -	depends on HID
  	help
  	  Adds support for side buttons of Xiaomi Mi Dual Mode Wireless
  	  Mouse Silent Edition.
@@@ -899,8 -960,18 +909,17 @@@ config PLAYSTATION_F
  	  Say Y here if you would like to enable force feedback support for
  	  PlayStation game controllers.
  
+ config HID_PXRC
+        tristate "PhoenixRC HID Flight Controller"
+        depends on HID
+        help
+        Support for PhoenixRC HID Flight Controller, a 8-axis flight controller.
+ 
+        To compile this driver as a module, choose M here: the
+        module will be called hid-pxrc.
+ 
  config HID_RAZER
  	tristate "Razer non-fully HID-compliant devices"
 -	depends on HID
  	help
  	Support for Razer devices that are not fully compliant with the
  	HID standard.