spi/xilinx: merge OF support code into main driver

[karo-tx-linux.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 58ad21c700d312eaa304087d7863c5236d50a488..665d03d4e022c93c9bc871b0189fb87e09da3965 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -353,7 +353,6 @@ config SPI_XILINX
        tristate "Xilinx SPI controller common module"
        depends on HAS_IOMEM && EXPERIMENTAL
        select SPI_BITBANG
-       select SPI_XILINX_OF if (XILINX_VIRTEX || MICROBLAZE)
        help
          This exposes the SPI controller IP from the Xilinx EDK.
 
@@ -362,12 +361,6 @@ config SPI_XILINX
 
          Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)"
 
-config SPI_XILINX_OF
-       tristate "Xilinx SPI controller OF device"
-       depends on SPI_XILINX && (XILINX_VIRTEX || MICROBLAZE)
-       help
-         This is the OF driver for the SPI controller IP from the Xilinx EDK.
-
 config SPI_NUC900
        tristate "Nuvoton NUC900 series SPI"
        depends on ARCH_W90X900 && EXPERIMENTAL