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 /fs/hfsplus/wrapper.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 'fs/hfsplus/wrapper.c')
| -rw-r--r-- | fs/hfsplus/wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c index ce9346099c72..9592ffcb44e5 100644 --- a/fs/hfsplus/wrapper.c +++ b/fs/hfsplus/wrapper.c @@ -12,7 +12,7 @@ #include <linux/fs.h> #include <linux/blkdev.h> #include <linux/cdrom.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include "hfsplus_fs.h" #include "hfsplus_raw.h" |