diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-11 18:57:39 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-07-11 18:58:07 -0700 |
| commit | 7b9c33b1e0e47f72d0af35d8a948900697da5871 (patch) | |
| tree | c7d4f05373df433bf8cba1a06eac2c97e8e8cf0d /fs_mgr | |
| parent | 786b1232d201d46f59bd9da84bfcfcb9ad80bb6c (diff) | |
| download | core-7b9c33b1e0e47f72d0af35d8a948900697da5871.tar.gz core-7b9c33b1e0e47f72d0af35d8a948900697da5871.tar.bz2 core-7b9c33b1e0e47f72d0af35d8a948900697da5871.zip | |
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.
The conflict was the actual intended change.
Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index d35af258c..e49096fef 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -35,7 +35,7 @@ struct fstab_rec { char *key_loc; }; -#define WAIT_TIMEOUT 5 +#define WAIT_TIMEOUT 20 /* fstab has the following format: * |