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

[karo-tx-linux.git] / drivers / mtd / maps / ixp2000.c

diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index fc7d4d0d9a4e4c31532577705f65209ffc1dbc7b..4a41ced0f71099045fcbd40f3db6aa9bd10ca401 100644 (file)
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -226,7 +226,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
        }
        info->mtd->owner = THIS_MODULE;
 
-       err = mtd_device_parse_register(info->mtd, probes, 0, NULL, 0);
+       err = mtd_device_parse_register(info->mtd, probes, NULL, NULL, 0);
        if (err)
                goto Error;