pinctrl: fix compile error if not select PINMUX support
authorDong Aisheng <dong.aisheng@linaro.org>
Thu, 5 Apr 2012 09:07:23 +0000 (17:07 +0800)
committerVarun Wadekar <vwadekar@nvidia.com>
Wed, 25 Apr 2012 06:52:55 +0000 (11:52 +0530)
commit7002ff1112645a375f2e866d62a60d6f1fd91aa5
tree1d5284f71e6574868bbd873268c445adba57b632
parent4e85011750c88d65bfc8196d2387d0ca969acf91
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>
include/linux/pinctrl/machine.h