aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/max77693-haptic.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2021-11-11 21:58:54 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-11-11 21:58:54 -0800
commitefe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch)
treeab5a4ac8c5b917b07af95c866770659f330b7f2b /drivers/input/misc/max77693-haptic.c
parentInput: touchscreen - avoid bitwise vs logical OR warning (diff)
parentInput: iforce - fix control-message timeout (diff)
downloadlinux-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.tar.gz
linux-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'drivers/input/misc/max77693-haptic.c')
-rw-r--r--drivers/input/misc/max77693-haptic.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/max77693-haptic.c b/drivers/input/misc/max77693-haptic.c
index 0d09ffeafeea..4369d3c04d38 100644
--- a/drivers/input/misc/max77693-haptic.c
+++ b/drivers/input/misc/max77693-haptic.c
@@ -424,5 +424,4 @@ module_platform_driver(max77693_haptic_driver);
MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
MODULE_DESCRIPTION("MAXIM 77693/77843 Haptic driver");
-MODULE_ALIAS("platform:max77693-haptic");
MODULE_LICENSE("GPL");