From 669008c43bae92130bf814d81fcca1f4526ece26 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:16:47 +0400 Subject: [PATCH] --- yaml --- r: 274779 b: refs/heads/master c: 2ef3855a91300bc0dae0ddc8689e4ee64abe6a8a h: refs/heads/master i: 274777: 3e2ff2323d0028c8ceef6df77696c4b265c93877 274775: a2ae7c66fefac5dedb47e0a9b67c2e42d3d493d3 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/rbtx4939-flash.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a2be69e6919b..bcfb579236b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d130a74e40da7dc4c572fbf0ba533fac17f4190 +refs/heads/master: 2ef3855a91300bc0dae0ddc8689e4ee64abe6a8a diff --git a/trunk/drivers/mtd/maps/rbtx4939-flash.c b/trunk/drivers/mtd/maps/rbtx4939-flash.c index 761fb459d2c7..5d15b6b32265 100644 --- a/trunk/drivers/mtd/maps/rbtx4939-flash.c +++ b/trunk/drivers/mtd/maps/rbtx4939-flash.c @@ -50,7 +50,6 @@ static int rbtx4939_flash_remove(struct platform_device *dev) } static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; -static const char *part_probe_types[] = { "cmdlinepart", NULL }; static int rbtx4939_flash_probe(struct platform_device *dev) { @@ -107,9 +106,7 @@ static int rbtx4939_flash_probe(struct platform_device *dev) info->mtd->owner = THIS_MODULE; if (err) goto err_out; - - err = parse_mtd_partitions(info->mtd, part_probe_types, - &info->parts, 0); + err = parse_mtd_partitions(info->mtd, NULL, &info->parts, 0); if (err > 0) { mtd_device_register(info->mtd, info->parts, err); info->nr_parts = err;