Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274796
b: refs/heads/master
c: 16b206e
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 1387250 commit f79b9ca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 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: 4ac6b3ef7191c508a356c205b02ab82f5e228d0c
refs/heads/master: 16b206e62f9b43ba864571a6808844aaddea7479
9 changes: 2 additions & 7 deletions trunk/drivers/mtd/nand/ppchameleonevb.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ static struct mtd_partition partition_info_evb[] = {

#define NUM_PARTITIONS 1

extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, const char *mtd_id);

/*
* hardware specific access to control-lines
*/
Expand Down Expand Up @@ -187,9 +185,6 @@ static int ppchameleonevb_device_ready(struct mtd_info *minfo)
}
#endif

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

/*
* Main initialization routine
*/
Expand Down Expand Up @@ -281,7 +276,7 @@ static int __init ppchameleonevb_init(void)
#endif

ppchameleon_mtd->name = "ppchameleon-nand";
mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, part_probes, &mtd_parts, 0);
mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else
Expand Down Expand Up @@ -382,7 +377,7 @@ static int __init ppchameleonevb_init(void)
}

ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;
mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, part_probes_evb, &mtd_parts, 0);
mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else
Expand Down

0 comments on commit f79b9ca

Please sign in to comment.