diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 00:20:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 00:20:28 +0300 |
| commit | 9af13088ab139ff1663e44e5746e152303cffbc7 (patch) | |
| tree | b42a8698b59d13194dc0dd410508582ea4f80a4b /arch/arm/mach-omap1/hardware.h | |
| parent | c6f2f3e2c80e975804360665d973211e4d9390cb (diff) | |
| parent | 7036440eab3e2d47a775d4616909f8235488d714 (diff) | |
| download | linux-9af13088ab139ff1663e44e5746e152303cffbc7.tar.xz | |
Merge tag 'arm-multiplatform-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull yet more ARM multiplatform updates from Arnd Bergmann:
"This is the third and final bit of the multiplatform conversion for
ARMv5, finishing off OMAP1. One patch enables the common-clk
interface, and the other ones does the Kconfig change.
These were waiting on a few dependencies to trickle in for common-clk,
and the last one of those was in the USB tree"
* tag 'arm-multiplatform-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: omap1: enable multiplatform
ARM: OMAP1: clock: Convert to CCF
Diffstat (limited to 'arch/arm/mach-omap1/hardware.h')
| -rw-r--r-- | arch/arm/mach-omap1/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/hardware.h b/arch/arm/mach-omap1/hardware.h index 738becbd2972..c228234a1ed4 100644 --- a/arch/arm/mach-omap1/hardware.h +++ b/arch/arm/mach-omap1/hardware.h @@ -64,7 +64,7 @@ static inline u32 omap_cs3_phys(void) #define OMAP1_IO_OFFSET 0x00f00000 /* Virtual IO = 0xff0b0000 */ #define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET) -#include <mach/serial.h> +#include "serial.h" /* * --------------------------------------------------------------------------- |