Skip to content

Commit 9dfe29d

Browse files
committed
Merge tag 'renesas-fixes-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Pull "Renesas ARM Based SoC Fixes for v4.12" from Simon Horman: * Provide dummy rcar_rst_read_mode_pins() for compile-testing * tag 'renesas-fixes-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing
2 parents e942661 + 7b4ccb3 commit 9dfe29d

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

include/linux/soc/renesas/rcar-rst.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__
22
#define __LINUX_SOC_RENESAS_RCAR_RST_H__
33

4+
#if defined(CONFIG_ARCH_RCAR_GEN1) || defined(CONFIG_ARCH_RCAR_GEN2) || \
5+
defined(CONFIG_ARCH_R8A7795) || defined(CONFIG_ARCH_R8A7796)
46
int rcar_rst_read_mode_pins(u32 *mode);
7+
#else
8+
static inline int rcar_rst_read_mode_pins(u32 *mode) { return -ENODEV; }
9+
#endif
510

611
#endif /* __LINUX_SOC_RENESAS_RCAR_RST_H__ */

0 commit comments

Comments
 (0)