Merge tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / mfd / tps65912-spi.c

diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index 6366576a3056dcd9d49a6925ccaea97499d1df0d..b45f460d299fe24218c176e88f56ac03710c6e9e 100644 (file)
--- a/drivers/mfd/tps65912-spi.c
+++ b/drivers/mfd/tps65912-spi.c
@@ -99,7 +99,7 @@ static int tps65912_spi_probe(struct spi_device *spi)
        return tps65912_device_init(tps65912);
 }
 
-static int __devexit tps65912_spi_remove(struct spi_device *spi)
+static int tps65912_spi_remove(struct spi_device *spi)
 {
        struct tps65912 *tps65912 = spi_get_drvdata(spi);