Merge branch 'for-5.15/logitech' into for-linus

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

diff --git a/drivers/Makefile b/drivers/Makefile
index 5a6d613..27c018b 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -78,7 +78,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 +160,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/