summaryrefslogtreecommitdiff
path: root/drivers/fpga
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/fpga
parentdc16594d9967773ca891b3d9111f152e3c99d1cf (diff)
parent8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff)
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'drivers/fpga')
-rw-r--r--drivers/fpga/microchip-spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/microchip-spi.c b/drivers/fpga/microchip-spi.c
index 2a82c726d6e5..6134cea86ac8 100644
--- a/drivers/fpga/microchip-spi.c
+++ b/drivers/fpga/microchip-spi.c
@@ -3,7 +3,7 @@
* Microchip Polarfire FPGA programming over slave SPI interface.
*/
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#include <linux/delay.h>
#include <linux/fpga/fpga-mgr.h>
#include <linux/iopoll.h>