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)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 11 Apr 2012 07:30:49 +0000 (09:30 +0200)
commit89e004e78ff6317520d35bdb0d0174893ab49f17
treebba46d61c1ed59376b06f89260b7566b582bee61
parent0034102808e0dbbf3a2394b82b1bb40b5778de9e
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