Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32...

[linux-2.6-microblaze.git] / drivers / spi / spi-mpc52xx.c

diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index 7c675fe..e3d29a5 100644 (file)
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -365,9 +365,6 @@ static int mpc52xx_spi_setup(struct spi_device *spi)
        if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST))
                return -EINVAL;
 
-       if (spi->chip_select >= spi->master->num_chipselect)
-               return -EINVAL;
-
        return 0;
 }