Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274799
b: refs/heads/master
c: a4c9361
h: refs/heads/master
i:
  274797: 94cb549
  274795: 1387250
  274791: 88e8424
  274783: 8edb4c9
v: v3
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 7766abe commit 697ca2c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 5b2efbdf70c74dcab575103c547ae27a71daba4c
refs/heads/master: a4c93614fded8ef0be90fca6a619d3c9c3e9552f
4 changes: 1 addition & 3 deletions trunk/drivers/mtd/nand/sharpsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat,
return readb(sharpsl->io + ECCCNTR) != 0;
}

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

/*
* Main initialization routine
*/
Expand Down Expand Up @@ -184,7 +182,7 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev)

/* Register the partitions */
sharpsl->mtd.name = "sharpsl-nand";
nr_partitions = parse_mtd_partitions(&sharpsl->mtd, part_probes, &sharpsl_partition_info, 0);
nr_partitions = parse_mtd_partitions(&sharpsl->mtd, NULL, &sharpsl_partition_info, 0);
if (nr_partitions <= 0) {
nr_partitions = data->nr_partitions;
sharpsl_partition_info = data->partitions;
Expand Down

0 comments on commit 697ca2c

Please sign in to comment.