Merge tag 'drm-intel-next-fixes-2014-12-11' of git://anongit.freedesktop.org/drm...

[deliverable/linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 65c32b1cea3d643b9065e55b4afb87e68e2e1142..ebee55537a057adf3c39c9e7b19565becec80663 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
 
 obj-$(CONFIG_PARPORT)          += parport/
 obj-y                          += base/ block/ misc/ mfd/ nfc/
+obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += macintosh/
 obj-$(CONFIG_IDE)              += ide/
@@ -159,3 +160,4 @@ obj-$(CONFIG_FMC)           += fmc/
 obj-$(CONFIG_POWERCAP)         += powercap/
 obj-$(CONFIG_MCB)              += mcb/
 obj-$(CONFIG_RAS)              += ras/
+obj-$(CONFIG_THUNDERBOLT)      += thunderbolt/