Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-at91 / board-usb-a926x.c

diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c
index c1476b9fe7b91a98ef279e4be2ecd250300bb1fc..6ea069b5733584b5a0fc68dd2cc61665763258c9 100644 (file)
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@ -109,14 +109,12 @@ static struct mmc_spi_platform_data at91_mmc_spi_pdata = {
  * SPI devices.
  */
 static struct spi_board_info usb_a9263_spi_devices[] = {
-#if !defined(CONFIG_MMC_AT91)
        {       /* DataFlash chip */
                .modalias       = "mtd_dataflash",
                .chip_select    = 0,
                .max_speed_hz   = 15 * 1000 * 1000,
                .bus_num        = 0,
        }
-#endif
 };
 
 static struct spi_board_info usb_a9g20_spi_devices[] = {