Merge tag 'arc-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

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

diff --git a/drivers/Makefile b/drivers/Makefile
index e06f7f6..24cd470 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -16,10 +16,7 @@ obj-$(CONFIG_PINCTRL)                += pinctrl/
 obj-$(CONFIG_GPIOLIB)          += gpio/
 obj-y                          += pwm/
 
-obj-$(CONFIG_PCI)              += pci/
-obj-$(CONFIG_PCI_ENDPOINT)     += pci/endpoint/
-# PCI dwc controller drivers
-obj-y                          += pci/dwc/
+obj-y                          += pci/
 
 obj-$(CONFIG_PARISC)           += parisc/
 obj-$(CONFIG_RAPIDIO)          += rapidio/
@@ -87,6 +84,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 +155,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/
@@ -184,3 +183,5 @@ obj-$(CONFIG_FPGA)          += fpga/
 obj-$(CONFIG_FSI)              += fsi/
 obj-$(CONFIG_TEE)              += tee/
 obj-$(CONFIG_MULTIPLEXER)      += mux/
+obj-$(CONFIG_UNISYS_VISORBUS)  += visorbus/
+obj-$(CONFIG_SIOX)             += siox/