diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-05-11 09:04:22 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-05-11 09:04:22 +0200 |
| commit | b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1 (patch) | |
| tree | ba257ac34b1ce57a29ec0d603b9e7d6400d6bea0 /drivers/pinctrl/Makefile | |
| parent | c0af14d3212a54c6a11759cd6b78e755c68714a1 (diff) | |
| parent | dcb5dbc305b975cccf40942feba40964069541d3 (diff) | |
| download | op-kernel-dev-b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1.zip op-kernel-dev-b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1.tar.gz | |
Merge tag 'pinctrl-mergebase-20120418' into HEAD
Conflicts:
drivers/pinctrl/core.c
Diffstat (limited to 'drivers/pinctrl/Makefile')
| -rw-r--r-- | drivers/pinctrl/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 6d4150b..8e3c95a 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -5,6 +5,9 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG obj-$(CONFIG_PINCTRL) += core.o obj-$(CONFIG_PINMUX) += pinmux.o obj-$(CONFIG_PINCONF) += pinconf.o +ifeq ($(CONFIG_OF),y) +obj-$(CONFIG_PINCTRL) += devicetree.o +endif obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o obj-$(CONFIG_PINCTRL_PXA3xx) += pinctrl-pxa3xx.o obj-$(CONFIG_PINCTRL_MMP2) += pinctrl-mmp2.o |
