Merge tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index ebee55537a057adf3c39c9e7b19565becec80663..67d2334dc41ecd571f9eb0dfd907cc87104912a9 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -161,3 +161,5 @@ obj-$(CONFIG_POWERCAP)              += powercap/
 obj-$(CONFIG_MCB)              += mcb/
 obj-$(CONFIG_RAS)              += ras/
 obj-$(CONFIG_THUNDERBOLT)      += thunderbolt/
+obj-$(CONFIG_CORESIGHT)                += coresight/
+obj-$(CONFIG_ANDROID)          += android/