diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
| commit | d1eec383a8abe348b5ce72df9e96bff3d9039134 (patch) | |
| tree | 6ea912eb2d4f2bee8301a04ebf82283805218ebf /drivers/iio/light/jsa1212.c | |
| parent | x86/tsc: Make __use_tsc __ro_after_init (diff) | |
| parent | Linux 6.9-rc3 (diff) | |
| download | linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.tar.xz linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.zip | |
Merge tag 'v6.9-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/light/jsa1212.c')
| -rw-r--r-- | drivers/iio/light/jsa1212.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/light/jsa1212.c b/drivers/iio/light/jsa1212.c index 37e2807041a1..869196746045 100644 --- a/drivers/iio/light/jsa1212.c +++ b/drivers/iio/light/jsa1212.c @@ -12,10 +12,10 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/delay.h> #include <linux/i2c.h> #include <linux/mutex.h> -#include <linux/acpi.h> #include <linux/regmap.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> @@ -438,7 +438,7 @@ static struct i2c_driver jsa1212_driver = { .driver = { .name = JSA1212_DRIVER_NAME, .pm = pm_sleep_ptr(&jsa1212_pm_ops), - .acpi_match_table = ACPI_PTR(jsa1212_acpi_match), + .acpi_match_table = jsa1212_acpi_match, }, .probe = jsa1212_probe, .remove = jsa1212_remove, |