Conflicts:
board/karo/common/mmc.c
int p;
int part;
block_dev_desc_t *dd;
int p;
int part;
block_dev_desc_t *dd;
dd = get_dev(ifname, devno);
if (!dd || dd->type == DEV_TYPE_UNKNOWN) {
dd = get_dev(ifname, devno);
if (!dd || dd->type == DEV_TYPE_UNKNOWN) {
ret = -1;
goto cleanup;
}
ret = -1;
goto cleanup;
}
+ snprintf(dev_part_str, sizeof(dev_part_str), "%d:%d", devno, part);
+ fs_set_blk_dev(ifname, dev_part_str, fstype);
ret = part;
*dev_desc = dd;
ret = part;
*dev_desc = dd;