diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-14 08:03:44 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-14 08:03:44 +0200 |
commit | 64f3b5a6bc49adf77d58eddd72a4bfccd492fa24 (patch) | |
tree | cdd6aa7a0d21482ae4d1e76d837f3712c8c6481d /drivers/iio/accel/bmi088-accel-core.c | |
parent | USB: chaoskey: Fix possible deadlock chaoskey_list_lock (diff) | |
parent | Linux 6.12-rc3 (diff) | |
download | linux-64f3b5a6bc49adf77d58eddd72a4bfccd492fa24.tar.xz linux-64f3b5a6bc49adf77d58eddd72a4bfccd492fa24.zip |
Merge 6.12-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel/bmi088-accel-core.c')
-rw-r--r-- | drivers/iio/accel/bmi088-accel-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/accel/bmi088-accel-core.c b/drivers/iio/accel/bmi088-accel-core.c index 469a1255d93c..fc1c1613d673 100644 --- a/drivers/iio/accel/bmi088-accel-core.c +++ b/drivers/iio/accel/bmi088-accel-core.c @@ -18,7 +18,7 @@ #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include "bmi088-accel.h" |