Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[~andy/linux] / drivers / mtd / maps / bfin-async-flash.c

diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 650126c361f18865d9e29b346fdeb8650208f9b6..ef5cde84a8b3bb962f1d7291e00c761ebdee729c 100644 (file)
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -164,8 +164,8 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       mtd_device_parse_register(state->mtd, part_probe_types, 0,
-                       pdata->parts, pdata->nr_parts);
+       mtd_device_parse_register(state->mtd, part_probe_types, NULL,
+                                 pdata->parts, pdata->nr_parts);
 
        platform_set_drvdata(pdev, state);