Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / drivers / mfd / asic3.c

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 63a2a6632106c3ad50a6ecbbb58e6ba80b11ba35..e22128c3e9a8a426825337eb5f2aadb5945f6ad2 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -908,7 +908,7 @@ static int __init asic3_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int asic3_remove(struct platform_device *pdev)
+static int __devexit asic3_remove(struct platform_device *pdev)
 {
        int ret;
        struct asic3 *asic = platform_get_drvdata(pdev);