Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

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

diff --git a/drivers/Makefile b/drivers/Makefile
index 7a2330077e4721ae485a4f5e94ac91438d938b83..7a0438744053dac52a4afc082767621a419ecabe 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_MTD)             += mtd/
 obj-$(CONFIG_SPI)              += spi/
 obj-$(CONFIG_SPMI)             += spmi/
 obj-$(CONFIG_HSI)              += hsi/
+obj-$(CONFIG_SLIMBUS)          += slimbus/
 obj-y                          += net/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_FUSION)           += message/
@@ -157,6 +158,7 @@ obj-$(CONFIG_MAILBOX)               += mailbox/
 obj-$(CONFIG_HWSPINLOCK)       += hwspinlock/
 obj-$(CONFIG_REMOTEPROC)       += remoteproc/
 obj-$(CONFIG_RPMSG)            += rpmsg/
+obj-$(CONFIG_SOUNDWIRE)                += soundwire/
 
 # Virtualization drivers
 obj-$(CONFIG_VIRT_DRIVERS)     += virt/
@@ -185,3 +187,4 @@ obj-$(CONFIG_FSI)           += fsi/
 obj-$(CONFIG_TEE)              += tee/
 obj-$(CONFIG_MULTIPLEXER)      += mux/
 obj-$(CONFIG_UNISYS_VISORBUS)  += visorbus/
+obj-$(CONFIG_SIOX)             += siox/