Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem
[linux-2.6.git] / drivers / Makefile
index 2b551e9..7fa433a 100644 (file)
@@ -122,4 +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/