aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/surface/aggregator/trace.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 /drivers/platform/surface/aggregator/trace.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 'drivers/platform/surface/aggregator/trace.h')
-rw-r--r--drivers/platform/surface/aggregator/trace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/surface/aggregator/trace.h b/drivers/platform/surface/aggregator/trace.h
index 55cc61bba1da..caf7d3cb5d8b 100644
--- a/drivers/platform/surface/aggregator/trace.h
+++ b/drivers/platform/surface/aggregator/trace.h
@@ -13,7 +13,7 @@
#include <linux/surface_aggregator/serial_hub.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#include <linux/tracepoint.h>
TRACE_DEFINE_ENUM(SSH_FRAME_TYPE_DATA_SEQ);