diff --git a/[refs] b/[refs] index 0cc2a55526b8..2bb988929457 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4af3bf6334341435740fce9ff236ba814686b99 +refs/heads/master: 82613b0da622efbd24cb7b23eb349966802310f1 diff --git a/trunk/drivers/mtd/nand/mxc_nand.c b/trunk/drivers/mtd/nand/mxc_nand.c index 65b26d5a5c0d..ef3e1998b591 100644 --- a/trunk/drivers/mtd/nand/mxc_nand.c +++ b/trunk/drivers/mtd/nand/mxc_nand.c @@ -1052,7 +1052,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) return err; } -static int __devexit mxcnd_remove(struct platform_device *pdev) +static int __exit mxcnd_remove(struct platform_device *pdev) { struct mxc_nand_host *host = platform_get_drvdata(pdev);