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

[linux-2.6-microblaze.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 5a6d613..be5d40a 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -70,7 +70,6 @@ obj-$(CONFIG_FB_I810)           += video/fbdev/i810/
 obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
 
 obj-$(CONFIG_PARPORT)          += parport/
-obj-$(CONFIG_NVM)              += lightnvm/
 obj-y                          += base/ block/ misc/ mfd/ nfc/
 obj-$(CONFIG_LIBNVDIMM)                += nvdimm/
 obj-$(CONFIG_DAX)              += dax/
@@ -78,7 +77,6 @@ obj-$(CONFIG_CXL_BUS)         += cxl/
 obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += macintosh/
-obj-$(CONFIG_IDE)              += ide/
 obj-y                          += scsi/
 obj-y                          += nvme/
 obj-$(CONFIG_ATA)              += ata/
@@ -161,7 +159,7 @@ obj-$(CONFIG_SOUNDWIRE)             += soundwire/
 
 # Virtualization drivers
 obj-$(CONFIG_VIRT_DRIVERS)     += virt/
-obj-$(CONFIG_HYPERV)           += hv/
+obj-$(subst m,y,$(CONFIG_HYPERV))      += hv/
 
 obj-$(CONFIG_PM_DEVFREQ)       += devfreq/
 obj-$(CONFIG_EXTCON)           += extcon/