Merge branch 'for-linus' of git://git.kernel.dk/linux-block

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

diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 5fd3f010e3aef041a89471fd413d9603174d10c1..8e148f1478fd2aa8d9c0d58655051c8fbfa528c2 100644 (file)
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -197,7 +197,7 @@ err:
        return ret;
 }
 
-static int __devinit ndfc_probe(struct platform_device *ofdev)
+static int ndfc_probe(struct platform_device *ofdev)
 {
        struct ndfc_controller *ndfc;
        const __be32 *reg;
@@ -256,7 +256,7 @@ static int __devinit ndfc_probe(struct platform_device *ofdev)
        return 0;
 }
 
-static int __devexit ndfc_remove(struct platform_device *ofdev)
+static int ndfc_remove(struct platform_device *ofdev)
 {
        struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev);
 
@@ -279,7 +279,7 @@ static struct platform_driver ndfc_driver = {
                .of_match_table = ndfc_match,
        },
        .probe = ndfc_probe,
-       .remove = __devexit_p(ndfc_remove),
+       .remove = ndfc_remove,
 };
 
 module_platform_driver(ndfc_driver);