Dong Aisheng 89e004e78f 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>		2012-04-11 09:30:49 +02:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
asm-generic	asm-generic: add linux/types.h to cmpxchg.h	2012-04-02 14:41:27 -07:00
crypto	crypto: user - Fix lookup of algorithms with IV generator	2012-03-29 19:52:47 +08:00
drm	Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux	2012-04-03 10:13:34 -07:00
keys
linux	pinctrl: fix compile error if not select PINMUX support	2012-04-11 09:30:49 +02:00
math-emu
media	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
misc
mtd
net	Merge branch 'master' of git://1984.lsi.us.es/net	2012-04-03 19:15:48 -04:00
pcmcia
rdma
rxrpc
scsi	SCSI updates on 20120331	2012-03-31 13:31:23 -07:00
sound	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
target
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-04-04 10:04:42 -07:00
video	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
xen	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-04-04 17:13:43 -07:00
Kbuild