Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 4f61e36..eb509f5 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1446,11 +1446,11 @@
switch (info->vendor) {
case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED:
- flash_read_jedec_ids_intel(info);
+ cmdset_intel_read_jedec_ids(info);
break;
case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED:
- flash_read_jedec_ids_amd(info);
+ cmdset_amd_read_jedec_ids(info);
break;
default:
break;