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/net/dsa | |
| 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/net/dsa')
| -rw-r--r-- | drivers/net/dsa/b53/b53_spi.c | 2 | ||||
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_spi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/b53/b53_spi.c b/drivers/net/dsa/b53/b53_spi.c index 308f15d3832e..467da057579e 100644 --- a/drivers/net/dsa/b53/b53_spi.c +++ b/drivers/net/dsa/b53/b53_spi.c @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <linux/delay.h> #include <linux/kernel.h> diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c index e3e341431f09..1c6652f2b9fe 100644 --- a/drivers/net/dsa/microchip/ksz_spi.c +++ b/drivers/net/dsa/microchip/ksz_spi.c @@ -6,7 +6,7 @@ * Tristram Ha <[email protected]> */ -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <linux/delay.h> #include <linux/kernel.h> |