diff options
| author | Mark Brown <[email protected]> | 2024-10-07 13:01:00 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2024-10-07 13:01:00 +0000 |
| commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
| tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /drivers/spi/spi-uniphier.c | |
| parent | Add of_regulator_get_optional() and Fix MTK Power (diff) | |
| parent | Linux 6.12-rc2 (diff) | |
| download | kernel-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/spi/spi-uniphier.c')
| -rw-r--r-- | drivers/spi/spi-uniphier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 4a18cf896194..07b155980e71 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -15,7 +15,7 @@ #include <linux/platform_device.h> #include <linux/spi/spi.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #define SSI_TIMEOUT_MS 2000 #define SSI_POLL_TIMEOUT_US 200 |