summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/goodix.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2024-05-22 17:39:34 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2024-05-22 17:39:34 -0700
commit2ec0028a1cadfb88d912435c1eb1ac5de76071f0 (patch)
treeb60ed6b29f5fba75d6f1c18c832aa6596a23d008 /drivers/input/touchscreen/goodix.c
parent0537c8eef4f699aacdeb67c6181c66cccd63c7f5 (diff)
parent832f54c9ccd3a3f32d1db905462d3c58b4df52bd (diff)
downloadlinux-next-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.tar.gz
linux-next-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.zip
Merge branch 'next' into for-linus
Prepare input updates for 6.10 merge window.
Diffstat (limited to 'drivers/input/touchscreen/goodix.c')
-rw-r--r--drivers/input/touchscreen/goodix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index b068ff8afbc9..435714f18c23 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -1510,7 +1510,7 @@ static int goodix_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(goodix_pm_ops, goodix_suspend, goodix_resume);
static const struct i2c_device_id goodix_ts_id[] = {
- { "GDIX1001:00", 0 },
+ { "GDIX1001:00" },
{ }
};
MODULE_DEVICE_TABLE(i2c, goodix_ts_id);