Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / drivers / regulator / tps6524x-regulator.c

diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 176a6be5a8ce20c733d241805c6b7698c5c7c494..9166aa0a9df71c582425d89a7d6517bd22f01072 100644 (file)
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -596,7 +596,7 @@ static struct regulator_ops regulator_ops = {
        .get_current_limit      = get_current_limit,
 };
 
-static int __devexit pmic_remove(struct spi_device *spi)
+static int pmic_remove(struct spi_device *spi)
 {
        struct tps6524x *hw = spi_get_drvdata(spi);
        int i;