diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-11 19:12:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-11 19:12:18 -0700 |
| commit | 81274e9e6c71510af9ca3a86c6ace3a73af976bd (patch) | |
| tree | f72714a7d3462ce4dc44510386816ffcab70ea17 /fs_mgr | |
| parent | ae118966dacfba0e0cd8425cf9059148262ea973 (diff) | |
| parent | 6b78fad147c772075eae5cfc25f5a50748bc4015 (diff) | |
| download | core-81274e9e6c71510af9ca3a86c6ace3a73af976bd.tar.gz core-81274e9e6c71510af9ca3a86c6ace3a73af976bd.tar.bz2 core-81274e9e6c71510af9ca3a86c6ace3a73af976bd.zip | |
am 6b78fad1: am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.
* commit '6b78fad147c772075eae5cfc25f5a50748bc4015':
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index fe8cb8058..465f51ef0 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -25,16 +25,6 @@ #define CRYPTO_TMPFS_OPTIONS "size=128m,mode=0771,uid=1000,gid=1000" -struct fstab_rec { - char *blk_dev; - char *mnt_point; - char *type; - unsigned long flags; - char *fs_options; - int fs_mgr_flags; - char *key_loc; -}; - #define WAIT_TIMEOUT 20 /* fstab has the following format: |