2 files changed, 3 insertions, 5 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index b64b49f6e01b..e4b260ecec15 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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/
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 @@
 
 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