From 7b9c33b1e0e47f72d0af35d8a948900697da5871 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 11 Jul 2013 18:57:39 -0700 Subject: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8. The conflict was the actual intended change. Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b --- fs_mgr/fs_mgr_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs_mgr') 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: * -- cgit v1.2.3