diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-13 04:57:34 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-13 04:57:34 +0200 |
| commit | 7af07ad902cce88ebbd2ce0e681d0c541e8f95fa (patch) | |
| tree | 40a5aedb583c35d16505d96ea8996c413a747fe6 /drivers/pinctrl/Makefile | |
| parent | Merge branch 'spear/pinctrl' into next/pinctrl (diff) | |
| parent | ARM: ux500: switch MSP to using pinctrl for pins (diff) | |
| download | linux-7af07ad902cce88ebbd2ce0e681d0c541e8f95fa.tar.xz linux-7af07ad902cce88ebbd2ce0e681d0c541e8f95fa.zip | |
Merge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/pinctrl
ux500 GPIO and pinctrl changes for kernel 3.5
* tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: switch MSP to using pinctrl for pins
ARM: ux500: alter MSP registration to return a device pointer
ARM: ux500: switch to using pinctrl for uart0
ARM: ux500: delete custom pin control system
ARM: ux500: switch over to Nomadik pinctrl driver
pinctrl: add sleep state definition
pinctrl/nomadik: implement pin configuration
pinctrl/nomadik: implement pin multiplexing
pinctrl/nomadik: reuse GPIO debug function for pins
pinctrl/nomadik: break out single GPIO debug function
pinctrl/nomadik: basic Nomadik pinctrl interface
pinctrl/nomadik: !CONFIG_OF build error
gpio: move the Nomadik GPIO driver to pinctrl
Context conflicts resolved in drivers/pinctrl/Kconfig and
drivers/pinctrl/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/pinctrl/Makefile')
| -rw-r--r-- | drivers/pinctrl/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index c9b0be56ff49..8e764ade929a 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -16,6 +16,8 @@ obj-$(CONFIG_PINCTRL_MMP2) += pinctrl-mmp2.o obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o +obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o +obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o obj-$(CONFIG_PINCTRL_PXA168) += pinctrl-pxa168.o obj-$(CONFIG_PINCTRL_PXA910) += pinctrl-pxa910.o obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o |