Merge branch 'for-3.1' into for-3.2

[~andy/linux] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 09f3232bcdcddd2ff2ce042cd0a7a977320356c4..7fa433a7030c4e00d300e000702ce7775dbc74b2 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -122,3 +122,8 @@ obj-y                               += ieee802154/
 obj-y                          += clk/
 
 obj-$(CONFIG_HWSPINLOCK)       += hwspinlock/
+obj-$(CONFIG_NFC)              += nfc/
+obj-$(CONFIG_IOMMU_SUPPORT)    += iommu/
+
+# Virtualization drivers
+obj-$(CONFIG_VIRT_DRIVERS)     += virt/