Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

[karo-tx-linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 09f3232bcdcddd2ff2ce042cd0a7a977320356c4..939fcdeb2d31a02f77ec7b5cecbd4cb0921da370 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -122,3 +122,5 @@ obj-y                               += ieee802154/
 obj-y                          += clk/
 
 obj-$(CONFIG_HWSPINLOCK)       += hwspinlock/
+obj-$(CONFIG_NFC)              += nfc/
+obj-$(CONFIG_IOMMU_SUPPORT)    += iommu/