Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95b612cc authored Jul 09, 2015 by Masahiro Yamada Committed by Linus Walleij Jul 16, 2015

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>

parent b3b66163

drivers/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ obj-y += bus/
		obj-$(CONFIG_GENERIC_PHY) += phy/

		# GPIO must come after pinctrl as gpios may need to mux pins etc
		obj-y += pinctrl/
		obj-$(CONFIG_PINCTRL) += pinctrl/
		obj-y += gpio/
		obj-y += pwm/
		obj-$(CONFIG_PCI) += pci/

drivers/pinctrl/Makefile

+2 −4

Original line number	Diff line number	Diff line
		@@ -2,12 +2,10 @@

		subdir-ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG

		obj-$(CONFIG_PINCTRL) += core.o pinctrl-utils.o
		obj-y += core.o pinctrl-utils.o
		obj-$(CONFIG_PINMUX) += pinmux.o
		obj-$(CONFIG_PINCONF) += pinconf.o
		ifeq ($(CONFIG_OF),y)
		obj-$(CONFIG_PINCTRL) += devicetree.o
		endif
		obj-$(CONFIG_OF) += devicetree.o
		obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o
		obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o
		obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o