Merge branch 'spi-5.2' into spi-next

This commit is contained in:
Mark Brown
2019-05-02 11:20:29 +09:00
55 changed files with 2412 additions and 653 deletions

View File

@@ -366,7 +366,7 @@ static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
return err;
}
const char *atmel_qspi_get_name(struct spi_mem *spimem)
static const char *atmel_qspi_get_name(struct spi_mem *spimem)
{
return dev_name(spimem->spi->dev.parent);
}