Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi

[deliverable/linux.git] / drivers / mtd / maps / autcpu12-nvram.c

diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index 76fb594bb1d9cd2629c1b80d08a04e7d5b28a92b..a2dc2ae4b24e69cc234a8946b9f1033a1e8fd7aa 100644 (file)
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -33,7 +33,7 @@ struct autcpu12_nvram_priv {
        struct map_info map;
 };
 
-static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
+static int autcpu12_nvram_probe(struct platform_device *pdev)
 {
        map_word tmp, save0, save1;
        struct resource *res;
@@ -105,7 +105,7 @@ static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
        return -ENOMEM;
 }
 
-static int __devexit autcpu12_nvram_remove(struct platform_device *pdev)
+static int autcpu12_nvram_remove(struct platform_device *pdev)
 {
        struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev);
 
@@ -121,7 +121,7 @@ static struct platform_driver autcpu12_nvram_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = autcpu12_nvram_probe,
-       .remove         = __devexit_p(autcpu12_nvram_remove),
+       .remove         = autcpu12_nvram_remove,
 };
 module_platform_driver(autcpu12_nvram_driver);