Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274790
b: refs/heads/master
c: 0455dfd
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent b01b4c7 commit d033320
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bef06150b2c0607edbee8e8c5fd7e882a90a976a
refs/heads/master: 0455dfd4c8614ae971202697f6db4d239e0b44c3
5 changes: 1 addition & 4 deletions trunk/drivers/mtd/maps/lantiq-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ ltq_copy_to(struct map_info *map, unsigned long to,
spin_unlock_irqrestore(&ebu_lock, flags);
}

static const char const *part_probe_types[] = { "cmdlinepart", NULL };

static int __init
ltq_mtd_probe(struct platform_device *pdev)
{
Expand Down Expand Up @@ -172,8 +170,7 @@ ltq_mtd_probe(struct platform_device *pdev)
cfi->addr_unlock1 ^= 1;
cfi->addr_unlock2 ^= 1;

nr_parts = parse_mtd_partitions(ltq_mtd->mtd,
part_probe_types, &parts, 0);
nr_parts = parse_mtd_partitions(ltq_mtd->mtd, NULL, &parts, 0);
if (nr_parts > 0) {
dev_info(&pdev->dev,
"using %d partitions from cmdline", nr_parts);
Expand Down

0 comments on commit d033320

Please sign in to comment.