diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-01-11 01:08:10 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-01-11 01:08:10 +0300 |
| commit | 6437c0291237227ed36f61ddd71e66ff983b4fe4 (patch) | |
| tree | 60f5152981a18f4a0801ada8f853d24c97bea3d4 /include/linux | |
| parent | daec8b54e9445566d003ac46e267e73755b5f55a (diff) | |
| parent | 9d46ce57f4d1c626bb48170226ea5e35deb5877c (diff) | |
| download | linux-6437c0291237227ed36f61ddd71e66ff983b4fe4.tar.xz | |
Merge branch 'armsoc-build-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/fixes
ARM: SoC fixes
These are three fixes for mistakes I discovered during the preparation
of the boardfile removal. Robert noticed the accidental removal
of PXA310 and PXA320 support because of a misplaced Kconfig statement,
and the two OMAP patches were build failures that got introduced
earlier but that I found while testing the removal.
* 'armsoc-build-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: omap1: fix building gpio15xx
ARM: omap1: fix !ARCH_OMAP1_ANY link failures
ARM: pxa: enable PXA310/PXA320 for DT-only build
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/ti/omap1-io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/soc/ti/omap1-io.h b/include/linux/soc/ti/omap1-io.h index f7f12728d4a6..9a60f45899d3 100644 --- a/include/linux/soc/ti/omap1-io.h +++ b/include/linux/soc/ti/omap1-io.h @@ -5,7 +5,7 @@ #ifndef __ASSEMBLER__ #include <linux/types.h> -#ifdef CONFIG_ARCH_OMAP1_ANY +#ifdef CONFIG_ARCH_OMAP1 /* * NOTE: Please use ioremap + __raw_read/write where possible instead of these */ @@ -15,7 +15,7 @@ extern u32 omap_readl(u32 pa); extern void omap_writeb(u8 v, u32 pa); extern void omap_writew(u16 v, u32 pa); extern void omap_writel(u32 v, u32 pa); -#else +#elif defined(CONFIG_COMPILE_TEST) static inline u8 omap_readb(u32 pa) { return 0; } static inline u16 omap_readw(u32 pa) { return 0; } static inline u32 omap_readl(u32 pa) { return 0; } |