commit b5df698f2c6a308e6221ab78fae402152e775c3c
author Simon Horman <horms+renesas@verge.net.au> Mon May 15 07:59:42 2017 +0200
committer Simon Horman <horms+renesas@verge.net.au> Mon May 15 07:59:42 2017 +0200
tree 9700bac21793a133b4980c7b04646778b183fe85
parent 2ea659a9ef488125eb46da6eb571de5eae5c43f6
parent 7b4ccb3c466f62bbf2f4dd5d6a143d945a6f3051

Merge branch 'fixes-for-v4.12' into next

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

diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h
index a18e078..787e7ad 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__ */