diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-08 21:55:01 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-07-16 03:40:09 -0400 |
commit | 95b612cc6c7f95f4e08f1b3dbc6588fda49b1b12 (patch) | |
tree | 512fb16a3bb084947f0c02f98510395cf1d348ab /drivers/pinctrl/Makefile | |
parent | b3b6616378a4dcf1e903c8ad70fabfe4c2ad529b (diff) |
pinctrl: move CONFIG_PINCTRL to drivers/Makefile
Kbuild should descend into drivers/pinctrl/ only when CONFIG_PINCTRL
is enabled because everything under that directory depends on
CONFIG_PINCTRL.
We can avoid the conditional, ifeq ($(CONFIG_OF),y) ... endif.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/Makefile')
-rw-r--r-- | drivers/pinctrl/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index f6710a8a1503..76ba976cb9ca 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile | |||
@@ -2,12 +2,10 @@ | |||
2 | 2 | ||
3 | subdir-ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG | 3 | subdir-ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG |
4 | 4 | ||
5 | obj-$(CONFIG_PINCTRL) += core.o pinctrl-utils.o | 5 | obj-y += core.o pinctrl-utils.o |
6 | obj-$(CONFIG_PINMUX) += pinmux.o | 6 | obj-$(CONFIG_PINMUX) += pinmux.o |
7 | obj-$(CONFIG_PINCONF) += pinconf.o | 7 | obj-$(CONFIG_PINCONF) += pinconf.o |
8 | ifeq ($(CONFIG_OF),y) | 8 | obj-$(CONFIG_OF) += devicetree.o |
9 | obj-$(CONFIG_PINCTRL) += devicetree.o | ||
10 | endif | ||
11 | obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o | 9 | obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o |
12 | obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o | 10 | obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o |
13 | obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o | 11 | obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o |