From: Linus Walleij <linus.wall...@linaro.org>
The stubs for the !PINCTRL case were placed in the wrong
part of the file, causing breakage in linux-next when compiling
SH without pinctrl. Fix it up by moving the stubs to the right
place.
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
---
include/linux/pinctrl/consumer.h | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 18cdbb1..7f18e4d 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -116,6 +116,26 @@ static inline void devm_pinctrl_put(struct pinctrl *p)
{
}
+static inline int pinctrl_pm_select_default_state(struct device *dev)
+{
+ return 0;
+}
+
+static inline int pinctrl_pm_select_active_state(struct device *dev)
+{
+ return 0;
+}
+
+static inline int pinctrl_pm_select_sleep_state(struct device *dev)
+{
+ return 0;
+}
+
+static inline int pinctrl_pm_select_idle_state(struct device *dev)
+{
+ return 0;
+}
+
#endif /* CONFIG_PINCTRL */
static inline struct pinctrl * __must_check pinctrl_get_select(
@@ -223,26 +243,6 @@ static inline int pin_config_group_set(const char
*dev_name,
return 0;
}
-static inline int pinctrl_pm_select_default_state(struct device *dev)
-{
- return 0;
-}
-
-static inline int pinctrl_pm_select_active_state(struct device *dev)
-{
- return 0;
-}
-
-static inline int pinctrl_pm_select_sleep_state(struct device *dev)
-{
- return 0;
-}
-
-static inline int pinctrl_pm_select_idle_state(struct device *dev)
-{
- return 0;
-}
-
#endif
#endif /* __LINUX_PINCTRL_CONSUMER_H */
--
1.7.11.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
