Merge tags 'disintegrate-h8300-20121219', 'disintegrate-m32r-20121219' and 'disintegr...

[~andy/linux] / drivers / mtd / nand / au1550nd.c

diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 73d6423680ca73d34b2eccd1ed0c0c1b9227ad45..217459d02b2f85b6d5730e1c0d77e4fac7a108eb 100644 (file)
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -491,7 +491,7 @@ out1:
        return ret;
 }
 
-static int __devexit au1550nd_remove(struct platform_device *pdev)
+static int au1550nd_remove(struct platform_device *pdev)
 {
        struct au1550nd_ctx *ctx = platform_get_drvdata(pdev);
        struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);