From a9396549b37d13c518c662c04f6ff42e9ae47c24 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 11 Jul 2013 19:07:06 -0700 Subject: [PATCH] Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder. Change-Id: I3f8bc955f035b49407540053462e53b3f262d381 --- fs_mgr/fs_mgr_priv.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index e49096fef..f961b390c 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: