summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2023-09-05 23:08:14 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2023-09-05 23:08:14 +0200
commit34069d12e239ae8f36dd96c378e4622fb1c42a76 (patch)
treeb33fabf1a4cc7530e93ab416f3156bdfe601a3a0 /drivers/input/misc
parentInput: rpckbd - fix the return value handle for platform_get_irq() (diff)
parentLinux 6.5 (diff)
downloadlinux-34069d12e239ae8f36dd96c378e4622fb1c42a76.tar.xz
linux-34069d12e239ae8f36dd96c378e4622fb1c42a76.zip
Merge tag 'v6.5' into next
Sync up with mainline to bring in updates to the shared infrastructure.
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c47eecc6f83b..6ba984d7f0b1 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -609,7 +609,7 @@ config INPUT_PWM_VIBRA
config INPUT_RK805_PWRKEY
tristate "Rockchip RK805 PMIC power key support"
- depends on MFD_RK808
+ depends on MFD_RK8XX
help
Select this option to enable power key driver for RK805.