summaryrefslogtreecommitdiff
path: root/drivers/spi/Makefile
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-10-14 09:32:53 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-11-09 21:41:28 -0700
commiteae6cb31d890e2860f9ce1b8ba73c27b6005af68 (patch)
treec0e7984b6f3a872be3a0deeb088fb402e1e06cd8 /drivers/spi/Makefile
parent8fd8821b62397f8ddb7bfb23c3246a22770ab2ee (diff)
downloadlinux-3.10-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.tar.gz
linux-3.10-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.tar.bz2
linux-3.10-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.zip
spi/xilinx: merge OF support code into main driver
Now that the of_platform_bus_type has been merged with the platform bus type, a single platform driver can handle both OF and non-OF use cases. This patch merges the OF support into the platform driver. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/spi/Makefile')
-rw-r--r--drivers/spi/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 0d03159b566..02dad4ae412 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -43,7 +43,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_SH_SCI) += spi_sh_sci.o
obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o