Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / staging / iio / meter / ade7854-spi.c

diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
index 9fb2f8bfca81966613872136e25eaef65bdc922e..7dae0357342826e6b7ae84855aba58a18ecc3e63 100644 (file)
--- a/drivers/staging/iio/meter/ade7854-spi.c
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@ -330,7 +330,7 @@ static int __devinit ade7854_spi_probe(struct spi_device *spi)
        return 0;
 }
 
-static int ade7854_spi_remove(struct spi_device *spi)
+static int __devexit ade7854_spi_remove(struct spi_device *spi)
 {
        ade7854_remove(spi_get_drvdata(spi));