diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-04-03 21:53:56 -0600 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-04-18 13:53:10 +0200 |
| commit | eafeb7a44aa8f79c992b9d557ede740c739f4b25 (patch) | |
| tree | 23806fb2a28e6152b37ac74ed458de8116438531 /drivers/pinctrl | |
| parent | 57291ce295c0aca738dd284c4a9c591c09ebee71 (diff) | |
| download | linux-eafeb7a44aa8f79c992b9d557ede740c739f4b25.tar.gz linux-eafeb7a44aa8f79c992b9d557ede740c739f4b25.tar.xz linux-eafeb7a44aa8f79c992b9d557ede740c739f4b25.zip | |
pinctrl: fix build when CONFIG_OF && !CONFIG_PINCTRL
pinctrl/devicetree.c won't compile when !CONFIG_PINCTRL, since the
pinctrl headers don't declare some types when !PINCTRL. Make sure
pinctrl/Makefile only attempts to compile devicetree.c when OF &&
PINCTRL.
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 049c9fb39dab..8e3c95a02fbd 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -5,7 +5,9 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG obj-$(CONFIG_PINCTRL) += core.o obj-$(CONFIG_PINMUX) += pinmux.o obj-$(CONFIG_PINCONF) += pinconf.o -obj-$(CONFIG_OF) += devicetree.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 |