diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-10-14 09:17:57 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-10-14 09:17:57 +0200 |
commit | 5338a96c974654e226665b2f412fad2f82d4b701 (patch) | |
tree | dad34c52f8ff45a3237b0cdc4521ad7978fe4d5e /drivers/iio/imu/adis.c | |
parent | b8128f7815ff135f0333c1b46dcdf1543c41b860 (diff) | |
parent | 26bb2dc102783fef49336b26a94563318f9790d3 (diff) |
Merge drm/drm-next into drm-misc-next
Backmerging to get fixes from v6.12-rc2.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/iio/imu/adis.c')
-rw-r--r-- | drivers/iio/imu/adis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c index 876848b42f69..99410733c1ca 100644 --- a/drivers/iio/imu/adis.c +++ b/drivers/iio/imu/adis.c @@ -13,7 +13,7 @@ #include <linux/kernel.h> #include <linux/spi/spi.h> #include <linux/module.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <linux/iio/iio.h> #include <linux/iio/imu/adis.h> |