From 88e84243b8d4058df2b56c9979744eedb06e85d4 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:25:01 +0400 Subject: [PATCH] --- yaml --- r: 274791 b: refs/heads/master c: ac9b0f3662f523e6aeb7669b40269ecbd2fd752b h: refs/heads/master i: 274789: b01b4c7f215c1c8317a6c2bb334496fa6c95d6dc 274787: 3a0e33150ef6cce02d138e2705ee8c1364f9790d 274783: 8edb4c983b7823dd3640812c456f9d0f765100dc v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/latch-addr-flash.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d0e5e14bd001..01c125e16da5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0455dfd4c8614ae971202697f6db4d239e0b44c3 +refs/heads/master: ac9b0f3662f523e6aeb7669b40269ecbd2fd752b diff --git a/trunk/drivers/mtd/maps/latch-addr-flash.c b/trunk/drivers/mtd/maps/latch-addr-flash.c index 5936c466e901..09cf704ea02e 100644 --- a/trunk/drivers/mtd/maps/latch-addr-flash.c +++ b/trunk/drivers/mtd/maps/latch-addr-flash.c @@ -97,8 +97,6 @@ static void lf_copy_from(struct map_info *map, void *to, static char *rom_probe_types[] = { "cfi_probe", NULL }; -static char *part_probe_types[] = { "cmdlinepart", NULL }; - static int latch_addr_flash_remove(struct platform_device *dev) { struct latch_addr_flash_info *info; @@ -206,8 +204,7 @@ static int __devinit latch_addr_flash_probe(struct platform_device *dev) } info->mtd->owner = THIS_MODULE; - err = parse_mtd_partitions(info->mtd, (const char **)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); return 0;