diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2017-05-15 07:59:42 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2017-05-15 07:59:42 +0200 |
| commit | b5df698f2c6a308e6221ab78fae402152e775c3c (patch) | |
| tree | 9700bac21793a133b4980c7b04646778b183fe85 /include | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
| parent | 7b4ccb3c466f62bbf2f4dd5d6a143d945a6f3051 (diff) | |
Merge branch 'fixes-for-v4.12' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/soc/renesas/rcar-rst.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h index a18e0783946b..787e7ad53d45 100644 --- a/include/linux/soc/renesas/rcar-rst.h +++ b/include/linux/soc/renesas/rcar-rst.h @@ -1,6 +1,11 @@ #ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__ #define __LINUX_SOC_RENESAS_RCAR_RST_H__ +#if defined(CONFIG_ARCH_RCAR_GEN1) || defined(CONFIG_ARCH_RCAR_GEN2) || \ + defined(CONFIG_ARCH_R8A7795) || defined(CONFIG_ARCH_R8A7796) int rcar_rst_read_mode_pins(u32 *mode); +#else +static inline int rcar_rst_read_mode_pins(u32 *mode) { return -ENODEV; } +#endif #endif /* __LINUX_SOC_RENESAS_RCAR_RST_H__ */ |