diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-24 11:10:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-24 11:10:45 +0100 |
| commit | 334c40b17f0cc3de114197fa2cd75f89e3387d22 (patch) | |
| tree | cac7df874865fe571ba0f5ece6173fe97e6a6201 /drivers/spi/spi-octeon.c | |
| parent | 39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff) | |
| parent | f8bb820da4ae863c676156627973a950129559fb (diff) | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi/spi-octeon.c')
| -rw-r--r-- | drivers/spi/spi-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c index b283d537d16a..e99d6a93d394 100644 --- a/drivers/spi/spi-octeon.c +++ b/drivers/spi/spi-octeon.c @@ -238,7 +238,7 @@ static int octeon_spi_remove(struct platform_device *pdev) return 0; } -static struct of_device_id octeon_spi_match[] = { +static const struct of_device_id octeon_spi_match[] = { { .compatible = "cavium,octeon-3010-spi", }, {}, }; |