aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/flat.h
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2024-10-07 13:01:00 +0000
committerMark Brown <[email protected]>2024-10-07 13:01:00 +0000
commit85eadae61931f6268b49b5722039e5a248b9ee4c (patch)
tree3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /arch/sh/include/asm/flat.h
parentAdd of_regulator_get_optional() and Fix MTK Power (diff)
parentLinux 6.12-rc2 (diff)
downloadkernel-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.gz
kernel-85eadae61931f6268b49b5722039e5a248b9ee4c.zip
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'arch/sh/include/asm/flat.h')
-rw-r--r--arch/sh/include/asm/flat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
index fee4f25555cb..70752c7bc55f 100644
--- a/arch/sh/include/asm/flat.h
+++ b/arch/sh/include/asm/flat.h
@@ -9,7 +9,7 @@
#ifndef __ASM_SH_FLAT_H
#define __ASM_SH_FLAT_H
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr)