Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[~andy/linux] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 6f193b02a9e835e9efa2b5a42fa86949d5053cef..f996c600eb8c6a63b0d3122dd0b267a95d032555 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1251,10 +1251,10 @@ int spi_master_resume(struct spi_master *master)
 }
 EXPORT_SYMBOL_GPL(spi_master_resume);
 
-static int __spi_master_match(struct device *dev, void *data)
+static int __spi_master_match(struct device *dev, const void *data)
 {
        struct spi_master *m;
-       u16 *bus_num = data;
+       const u16 *bus_num = data;
 
        m = container_of(dev, struct spi_master, dev);
        return m->bus_num == *bus_num;