Merge branch 'master' into upstream-fixes

[~andy/linux] / drivers / misc / Makefile

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 19c2b85249c3029556e532117394f65d611ce0f8..d65ece76095a43283de2714a8c7dc0ac9a0f1625 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -3,5 +3,8 @@
 #
 obj- := misc.o # Dummy rule to force built-in.o to be made
 
-obj-$(CONFIG_IBM_ASM)  += ibmasm/
+obj-$(CONFIG_IBM_ASM)          += ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)    += hdpuftrs/
+obj-$(CONFIG_LKDTM)            += lkdtm.o
+obj-$(CONFIG_TIFM_CORE)        += tifm_core.o
+obj-$(CONFIG_TIFM_7XX1)        += tifm_7xx1.o