Merge tag 'platform-drivers-x86-v5.4-2' of git://git.infradead.org/linux-platform...

[linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 05be8c798c51950fe406e3af19c142b50d1c3581..aaef17cc651287afb4b51fca89829b2efa743365 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -100,7 +100,6 @@ obj-$(CONFIG_ZORRO)         += zorro/
 obj-$(CONFIG_ATA_OVER_ETH)     += block/aoe/
 obj-$(CONFIG_PARIDE)           += block/paride/
 obj-$(CONFIG_TC)               += tc/
-obj-$(CONFIG_UWB)              += uwb/
 obj-$(CONFIG_USB_PHY)          += usb/
 obj-$(CONFIG_USB)              += usb/
 obj-$(CONFIG_USB_SUPPORT)      += usb/
@@ -147,6 +146,7 @@ obj-$(CONFIG_BCMA)          += bcma/
 obj-$(CONFIG_VHOST_RING)       += vhost/
 obj-$(CONFIG_VHOST)            += vhost/
 obj-$(CONFIG_VLYNQ)            += vlynq/
+obj-$(CONFIG_GREYBUS)          += greybus/
 obj-$(CONFIG_STAGING)          += staging/
 obj-y                          += platform/