From: Linus Walleij Date: Tue, 6 Mar 2012 22:30:15 +0000 (+0100) Subject: Merge branch 'pinctrl-tegra-for-next-diet' into for-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a6c3b33f02c799db69a3cd82545e45e9df3d69ca;p=mv-sheeva.git Merge branch 'pinctrl-tegra-for-next-diet' into for-next --- a6c3b33f02c799db69a3cd82545e45e9df3d69ca diff --cc drivers/pinctrl/Makefile index c95d91e87b5,be3845551f8..754329b9c61 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@@ -5,10 -5,9 +5,13 @@@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDE obj-$(CONFIG_PINCTRL) += core.o obj-$(CONFIG_PINMUX) += pinmux.o obj-$(CONFIG_PINCONF) += pinconf.o +obj-$(CONFIG_PINCTRL_PXA3xx) += pinctrl-pxa3xx.o +obj-$(CONFIG_PINCTRL_MMP2) += pinctrl-mmp2.o +obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o +obj-$(CONFIG_PINCTRL_PXA910) += pinctrl-pxa910.o obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o + obj-$(CONFIG_PINCTRL_TEGRA) += pinctrl-tegra.o + obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o + obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o