Merge u-boot/master into u-boot-ti/master

[karo-tx-uboot.git] / drivers / spi / atmel_spi.c

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c7a51f7f39a368bdec2b368e470e6386d8228760..ce7d46085543330cf1721b7585557e5a797af2fe 100644 (file)
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -92,7 +92,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        as->slave.cs = cs;
        as->regs = regs;
        as->mr = ATMEL_SPI_MR_MSTR | ATMEL_SPI_MR_MODFDIS
-#if defined(CONFIG_AT91SAM9X5)
+#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9M10G45)
                        | ATMEL_SPI_MR_WDRBT
 #endif
                        | ATMEL_SPI_MR_PCS(~(1 << cs) & 0xf);