diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 22:33:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 22:33:32 +0100 |
| commit | f7b352eb9575fb66cc8c90f25575ed6766d9737a (patch) | |
| tree | b830cc5df48feb38191863444605bba19e533367 | |
| parent | f03f6e276bdd332a53118ed51b325c3367814267 (diff) | |
| parent | 4f8ec94af325d501904d7e86363bd162004161bd (diff) | |
| download | linux-f7b352eb9575fb66cc8c90f25575ed6766d9737a.tar.gz linux-f7b352eb9575fb66cc8c90f25575ed6766d9737a.zip | |
Merge tag 'imx-soc-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/arm
i.MX SoC changes for 6.15:
- Mark imx53_suspend_sz as __maybe_unused to fix a possible build warning
* tag 'imx-soc-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: mark imx53_suspend_sz as unused
Link: https://lore.kernel.org/r/20250312074005.663165-2-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-imx/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 13f3068e9845..45c1a2a7b35f 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -98,7 +98,7 @@ extern const u32 imx53_suspend_sz; void imx6_suspend(void __iomem *ocram_vbase); #else static inline void imx53_suspend(void __iomem *ocram_vbase) {} -static const u32 imx53_suspend_sz; +static __maybe_unused const u32 imx53_suspend_sz; static inline void imx6_suspend(void __iomem *ocram_vbase) {} #endif |