summaryrefslogtreecommitdiffstats
path: root/net/ax25/ax25_timer.c
diff options
context:
space:
mode:
authorDong Aisheng <dong.aisheng@linaro.org>2012-04-05 17:07:23 +0800
committerLinus Walleij <linus.walleij@linaro.org>2012-04-18 13:53:09 +0200
commit6974f1f458b083a84778641c6a4665799d6156da (patch)
tree1c6c3cc3aaa6e743789ceb2c8d45eed59e8d7ca8 /net/ax25/ax25_timer.c
parente816b57a337ea3b755de72bec38c10c864f23015 (diff)
downloadlinux-6974f1f458b083a84778641c6a4665799d6156da.tar.gz
linux-6974f1f458b083a84778641c6a4665799d6156da.tar.bz2
linux-6974f1f458b083a84778641c6a4665799d6156da.zip
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>
Diffstat (limited to 'net/ax25/ax25_timer.c')
0 files changed, 0 insertions, 0 deletions