Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[cascardo/linux.git] / drivers / Makefile
index 65c32b1..54bfae1 100644 (file)
@@ -159,3 +159,4 @@ obj-$(CONFIG_FMC)           += fmc/
 obj-$(CONFIG_POWERCAP)         += powercap/
 obj-$(CONFIG_MCB)              += mcb/
 obj-$(CONFIG_RAS)              += ras/
+obj-$(CONFIG_THUNDERBOLT)      += thunderbolt/