diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-11-24 17:05:27 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-11-24 17:05:27 -0800 |
| commit | 0201710ba6308a61f1a775c418fe74b8a31ace08 (patch) | |
| tree | 4ba8de26ade82869bce1014f1ab19207ec070548 /drivers/input/touchscreen/imagis.c | |
| parent | 5c822c0ce5cc83ed4cd8394f3dc46dae8d9a681d (diff) | |
| parent | 04337738629e8020c272c0dfcd56b9ae0a55ce98 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.13 merge window.
Diffstat (limited to 'drivers/input/touchscreen/imagis.c')
| -rw-r--r-- | drivers/input/touchscreen/imagis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/imagis.c b/drivers/input/touchscreen/imagis.c index aeabf8d057de..abeae9102323 100644 --- a/drivers/input/touchscreen/imagis.c +++ b/drivers/input/touchscreen/imagis.c @@ -395,6 +395,7 @@ static int imagis_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(imagis_pm_ops, imagis_suspend, imagis_resume); +#ifdef CONFIG_OF static const struct imagis_properties imagis_3032c_data = { .interrupt_msg_cmd = IST3038C_REG_INTR_MESSAGE, .touch_coord_cmd = IST3038C_REG_TOUCH_COORD, @@ -427,7 +428,6 @@ static const struct imagis_properties imagis_3038c_data = { .protocol_b = true, }; -#ifdef CONFIG_OF static const struct of_device_id imagis_of_match[] = { { .compatible = "imagis,ist3032c", .data = &imagis_3032c_data }, { .compatible = "imagis,ist3038", .data = &imagis_3038_data }, |