Merge remote-tracking branch 'random/dev'

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

diff --git a/drivers/Makefile b/drivers/Makefile
index ab93de8297f1338fc2440967ce8934a7ff6bc043..3cc8214f9b26630e86eddcb37ac35f7a5f57e4a1 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -8,6 +8,8 @@
 obj-y                          += irqchip/
 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-y                          += gpio/
@@ -152,3 +154,4 @@ obj-$(CONFIG_VME_BUS)               += vme/
 obj-$(CONFIG_IPACK_BUS)                += ipack/
 obj-$(CONFIG_NTB)              += ntb/
 obj-$(CONFIG_FMC)              += fmc/
+obj-$(CONFIG_POWERCAP)         += powercap/