diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-15 17:40:14 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2010-09-15 17:40:14 -0700 |
| commit | a66c32ab1dde5ea8fc5d9fd9450ded267a94c429 (patch) | |
| tree | 54b9729748467b6b9f3f4d67227e4cce085fecd4 /updater/install.c | |
| parent | d7693c4c8e0825927fe5d76133fed96b43e60afb (diff) | |
| parent | 9f89b0e4673f0e28066ba41321dc9e626e04c64f (diff) | |
| download | bootable_recovery-a66c32ab1dde5ea8fc5d9fd9450ded267a94c429.zip bootable_recovery-a66c32ab1dde5ea8fc5d9fd9450ded267a94c429.tar.gz bootable_recovery-a66c32ab1dde5ea8fc5d9fd9450ded267a94c429.tar.bz2 | |
resolved conflicts for merge of 9f89b0e4 to master
Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
Diffstat (limited to 'updater/install.c')
| -rw-r--r-- | updater/install.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/updater/install.c b/updater/install.c index 685b979..6a8c5d4 100644 --- a/updater/install.c +++ b/updater/install.c @@ -237,7 +237,7 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) { #ifdef USE_EXT4 } else if (strcmp(fs_type, "ext4") == 0) { reset_ext4fs_info(); - int status = make_ext4fs(location, NULL, NULL, 0, 0, 0); + int status = make_ext4fs(location, NULL, NULL, 0, 0); if (status != 0) { fprintf(stderr, "%s: make_ext4fs failed (%d) on %s", name, status, location); |