diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-21 14:37:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 14:37:10 -0700 |
| commit | 8147ba850b2e74dc950183e67c77a0da2b1a19b7 (patch) | |
| tree | 5fc4f04fc540d627934a6c677e077ef4ac76c4c8 | |
| parent | 3dba40da1e533c6f419857e4274d9d9dd55868b6 (diff) | |
| parent | 93ca4fc6943a3ebf758c5db98531531b8fe92c98 (diff) | |
| download | bootable_recovery-8147ba850b2e74dc950183e67c77a0da2b1a19b7.zip bootable_recovery-8147ba850b2e74dc950183e67c77a0da2b1a19b7.tar.gz bootable_recovery-8147ba850b2e74dc950183e67c77a0da2b1a19b7.tar.bz2 | |
am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)
Merge commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98' into gingerbread-plus-aosp
* commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98':
use fs_type "emmc" instead of "block" for consistency (do not merge)
| -rw-r--r-- | bootloader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootloader.c b/bootloader.c index 7da3f4e..b690c55 100644 --- a/bootloader.c +++ b/bootloader.c @@ -32,7 +32,7 @@ int get_bootloader_message(struct bootloader_message *out) { Volume* v = volume_for_path("/misc"); if (strcmp(v->fs_type, "mtd") == 0) { return get_bootloader_message_mtd(out, v); - } else if (strcmp(v->fs_type, "block") == 0) { + } else if (strcmp(v->fs_type, "emmc") == 0) { return get_bootloader_message_block(out, v); } LOGE("unknown misc partition fs_type \"%s\"\n", v->fs_type); @@ -43,7 +43,7 @@ int set_bootloader_message(const struct bootloader_message *in) { Volume* v = volume_for_path("/misc"); if (strcmp(v->fs_type, "mtd") == 0) { return set_bootloader_message_mtd(in, v); - } else if (strcmp(v->fs_type, "block") == 0) { + } else if (strcmp(v->fs_type, "emmc") == 0) { return set_bootloader_message_block(in, v); } LOGE("unknown misc partition fs_type \"%s\"\n", v->fs_type); |