In Linux, mmcblk# now matches the mmc controller.  sd is mmc1, and emmc is mmc2.