diff options
| author | Ed Tam <etam@google.com> | 2015-04-13 18:01:33 -0700 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2015-04-13 18:01:33 -0700 |
| commit | e498c7ca2cdbf4a16aa155bca3357c4ece401854 (patch) | |
| tree | ce692fbd672f599211b5d7a11f6f06dfc979db81 /fs_mgr/fs_mgr_priv.h | |
| parent | 25c39b6aaf6440b4b65bbf0f9f024cff52f5f63b (diff) | |
| parent | d0b6de41f8b36df751962e28803db7a4375751ff (diff) | |
| download | system_core-e498c7ca2cdbf4a16aa155bca3357c4ece401854.zip system_core-e498c7ca2cdbf4a16aa155bca3357c4ece401854.tar.gz system_core-e498c7ca2cdbf4a16aa155bca3357c4ece401854.tar.bz2 | |
resolved conflicts for merge of d0b6de41 to master
Change-Id: I1d1f6b1cdbd7ee441682c4258a11fb3198ca7d94
Diffstat (limited to 'fs_mgr/fs_mgr_priv.h')
| -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 ee944c1..682fd11 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -78,10 +78,10 @@ external storage */ #define MF_NOTRIM 0x1000 #define MF_FILEENCRYPTION 0x2000 +#define MF_FORMATTABLE 0x4000 #define DM_BUF_SIZE 4096 int fs_mgr_set_blk_ro(const char *blockdev); #endif /* __CORE_FS_MGR_PRIV_H */ - |