Merge remote-tracking branch 'c6x/for-linux-next'

[karo-tx-linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 47a118aec76f1253854d8f5c7cea1cf903f24d8a..b250b36b54f26690840ffdd47d0c96bfc3aec7b6 100644 (file)
--- 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/