diff --git a/[refs] b/[refs] index daf88748c23c..60135bb4e6be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08a16d9f0effe8b7fd31995a7bd418a45ef2d6e7 +refs/heads/master: c3dee74f52bb844db40865dae3c465212c6a09eb diff --git a/trunk/drivers/staging/adis16255/adis16255.c b/trunk/drivers/staging/adis16255/adis16255.c index 1ba11f00b2e7..55d66e290f7d 100644 --- a/trunk/drivers/staging/adis16255/adis16255.c +++ b/trunk/drivers/staging/adis16255/adis16255.c @@ -361,7 +361,7 @@ static int spi_adis16255_bringup(struct spi_adis16255_data *spiadis) /*-------------------------------------------------------------------------*/ -static int spi_adis16255_probe(struct spi_device *spi) +static int __devinit spi_adis16255_probe(struct spi_device *spi) { struct adis16255_init_data *init_data = spi->dev.platform_data; @@ -421,7 +421,7 @@ static int spi_adis16255_probe(struct spi_device *spi) return status; } -static int spi_adis16255_remove(struct spi_device *spi) +static int __devexit spi_adis16255_remove(struct spi_device *spi) { struct spi_adis16255_data *spiadis = dev_get_drvdata(&spi->dev);