diff options
author | Mark Brown <broonie@kernel.org> | 2024-10-07 14:53:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2024-10-07 14:53:15 +0100 |
commit | c2a59c892f20379a3e48124a83491a12374cd7e0 (patch) | |
tree | 7f280fc4108d8ace769ba2e2368a53d71dcdbe4b /drivers/spi/spi-npcm-pspi.c | |
parent | eb6c65049a274c37f9b6fdf632843b609a0b8fa8 (diff) | |
parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) |
spi: Merge up v6.12
Fixes build issues with the KVM selftests.
Diffstat (limited to 'drivers/spi/spi-npcm-pspi.c')
-rw-r--r-- | drivers/spi/spi-npcm-pspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c index e4c291e653c8..98b6479b961c 100644 --- a/drivers/spi/spi-npcm-pspi.c +++ b/drivers/spi/spi-npcm-pspi.c @@ -12,7 +12,7 @@ #include <linux/spi/spi.h> #include <linux/reset.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h> |