summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDong Aisheng <dong.aisheng@linaro.org>2012-04-05 13:07:23 +0400
committerLinus Walleij <linus.walleij@linaro.org>2012-04-18 15:53:09 +0400
commit6974f1f458b083a84778641c6a4665799d6156da (patch)
tree1c6c3cc3aaa6e743789ceb2c8d45eed59e8d7ca8
parente816b57a337ea3b755de72bec38c10c864f23015 (diff)
downloadlinux-6974f1f458b083a84778641c6a4665799d6156da.tar.xz
pinctrl: fix compile error if not select PINMUX support
The pinctrl_register_mappings is defined in core.c, so change the dependent macro from CONFIG_MUX to CONFIG_PINCTRL. The compile error message is: drivers/pinctrl/core.c:886: error: redefinition of 'pinctrl_register_mappings' include/linux/pinctrl/machine.h:160: note: previous definition of 'pinctrl_register_mappings' was here make[2]: *** [drivers/pinctrl/core.o] Error 1 make[1]: *** [drivers/pinctrl] Error 2 make: *** [drivers] Error 2 Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--include/linux/pinctrl/machine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h
index fee4349364f7..d32eb8ccba84 100644
--- a/include/linux/pinctrl/machine.h
+++ b/include/linux/pinctrl/machine.h
@@ -148,7 +148,7 @@ struct pinctrl_map {
#define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \
PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)
-#ifdef CONFIG_PINMUX
+#ifdef CONFIG_PINCTRL
extern int pinctrl_register_mappings(struct pinctrl_map const *map,
unsigned num_maps);