aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/pci
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-10-07 14:01:00 +0100
committerMark Brown <broonie@kernel.org>2024-10-07 14:01:00 +0100
commit85eadae61931f6268b49b5722039e5a248b9ee4c (patch)
tree3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /drivers/pci
parentAdd of_regulator_get_optional() and Fix MTK Power (diff)
parentLinux 6.12-rc2 (diff)
downloadwireguard-linux-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.xz
wireguard-linux-85eadae61931f6268b49b5722039e5a248b9ee4c.zip
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/vpd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index 485a642b9304..e4300f5f304f 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -9,7 +9,7 @@
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/sched/signal.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#include "pci.h"
#define PCI_VPD_LRDT_TAG_SIZE 3