Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

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

diff --git a/drivers/Makefile b/drivers/Makefile
index 4c270f5414f0b017819d52d29bbab630a5174992..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/
@@ -161,6 +161,7 @@ obj-$(CONFIG_NTB)           += ntb/
 obj-$(CONFIG_FMC)              += fmc/
 obj-$(CONFIG_POWERCAP)         += powercap/
 obj-$(CONFIG_MCB)              += mcb/
+obj-$(CONFIG_PERF_EVENTS)      += perf/
 obj-$(CONFIG_RAS)              += ras/
 obj-$(CONFIG_THUNDERBOLT)      += thunderbolt/
 obj-$(CONFIG_CORESIGHT)                += hwtracing/coresight/