Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index ebee555..67d2334 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/