Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next

[firefly-linux-kernel-4.4.55.git] / drivers / spi / Makefile

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index bdc4c400fd7132108dda9d2efeea0d77d7eaf7ed..3a42463c92a4935c7b56019910c096c1780e587c 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -17,7 +17,8 @@ obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o
 obj-$(CONFIG_SPI_COLDFIRE_QSPI)                += coldfire_qspi.o
 obj-$(CONFIG_SPI_DAVINCI)              += davinci_spi.o
 obj-$(CONFIG_SPI_DESIGNWARE)           += dw_spi.o
-obj-$(CONFIG_SPI_DW_PCI)               += dw_spi_pci.o
+obj-$(CONFIG_SPI_DW_PCI)               += dw_spi_midpci.o
+dw_spi_midpci-objs                     := dw_spi_pci.o dw_spi_mid.o
 obj-$(CONFIG_SPI_DW_MMIO)              += dw_spi_mmio.o
 obj-$(CONFIG_SPI_EP93XX)               += ep93xx_spi.o
 obj-$(CONFIG_SPI_GPIO)                 += spi_gpio.o
@@ -44,8 +45,6 @@ obj-$(CONFIG_SPI_TEGRA)                       += spi_tegra.o
 obj-$(CONFIG_SPI_TOPCLIFF_PCH)         += spi_topcliff_pch.o
 obj-$(CONFIG_SPI_TXX9)                 += spi_txx9.o
 obj-$(CONFIG_SPI_XILINX)               += xilinx_spi.o
-obj-$(CONFIG_SPI_XILINX_OF)            += xilinx_spi_of.o
-obj-$(CONFIG_SPI_XILINX_PLTFM)         += xilinx_spi_pltfm.o
 obj-$(CONFIG_SPI_SH_SCI)               += spi_sh_sci.o
 obj-$(CONFIG_SPI_SH_MSIOF)             += spi_sh_msiof.o
 obj-$(CONFIG_SPI_STMP3XXX)             += spi_stmp.o