Commit a49e391c authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 91ca244b 14801c62

drivers/mmc/host/mmc_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ static void mmc_spi_dma_free(struct mmc_spi_host *host) 
			 DMA_BIDIRECTIONAL);

}

#else

static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; }

static inline int mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; }

static inline void mmc_spi_dma_free(struct mmc_spi_host *host) {}

#endif