summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2012-04-16 14:22:34 +0530
committerLinus Walleij <linus.walleij@linaro.org>2012-04-18 13:53:12 +0200
commit96593afe6d724ffca309340afa914f8e1c6719fd (patch)
tree6bbe6972da158c3c6c23b6f369e8a599aa1fef33 /drivers/pinctrl
parent6cb4158757a8629e14851e7802f3b6bfaa7d6f00 (diff)
downloadlinux-96593afe6d724ffca309340afa914f8e1c6719fd.tar.gz
linux-96593afe6d724ffca309340afa914f8e1c6719fd.tar.bz2
linux-96593afe6d724ffca309340afa914f8e1c6719fd.zip
pinctrl: pinconf: fix compilation error if PINCONF is not selected
When we compile pinctrl layer for platforms without CONFIG_PINCONF, we get following compilation errors: drivers/built-in.o: In function `pinctrl_show': linux-2.6/drivers/pinctrl/core.c:1116: undefined reference to `pinconf_show_setting' drivers/built-in.o: In function `pinctrl_maps_show': linux-2.6/drivers/pinctrl/core.c:1071: undefined reference to `pinconf_show_map' drivers/built-in.o: In function `pinctrl_init_device_debugfs': linux-2.6/drivers/pinctrl/core.c:1224: undefined reference to `pinconf_init_device_debugfs' make[1]: *** [.tmp_vmlinux1] Error 1 This patch fixes this. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinconf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 32b8354d2510..e3ed8cb072a5 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -58,7 +58,7 @@ static inline int pinconf_apply_setting(struct pinctrl_setting const *setting)
#endif
-#if defined(CONFIG_PINMUX) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_PINCONF) && defined(CONFIG_DEBUG_FS)
void pinconf_show_map(struct seq_file *s, struct pinctrl_map const *map);
void pinconf_show_setting(struct seq_file *s,