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

[~andy/linux] / drivers / mfd / asic3.c

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 62f0883a7630c360ab9e52f9fa11f306d1a3efee..1b15986c01e11fd664686edfaba5c2dfca65213c 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -1039,7 +1039,7 @@ static int __init asic3_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit asic3_remove(struct platform_device *pdev)
+static int asic3_remove(struct platform_device *pdev)
 {
        int ret;
        struct asic3 *asic = platform_get_drvdata(pdev);
@@ -1071,7 +1071,7 @@ static struct platform_driver asic3_device_driver = {
        .driver         = {
                .name   = "asic3",
        },
-       .remove         = __devexit_p(asic3_remove),
+       .remove         = asic3_remove,
        .shutdown       = asic3_shutdown,
 };