diff options
author | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:29 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:29 +0900 |
commit | 2e5f081003f033d37be3faf052aaccc8b6a44aa5 (patch) | |
tree | 6d07a9bfff47b20f997ecce96162b8ca9cf7b19c /drivers/spi/atmel-quadspi.c | |
parent | 58b860ed4a77d9cb17b78e663a0341b79a12e240 (diff) | |
parent | d61ad23cb3be09ff4956e9b9794134456522817f (diff) |
Merge branch 'spi-5.2' into spi-next
Diffstat (limited to 'drivers/spi/atmel-quadspi.c')
-rw-r--r-- | drivers/spi/atmel-quadspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index b3173ebddade..9f24d5f0b431 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -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); } |