commit 6b78fad147c772075eae5cfc25f5a50748bc4015
author Elliott Hughes <enh@google.com> Thu Jul 11 19:10:01 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 11 19:10:01 2013 -0700
tree baed3837841e73b6a4f7229c5ddda96149752196
parent 435640312ce48dab201d6f26a6258143a82f551e
parent a9396549b37d13c518c662c04f6ff42e9ae47c24

am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.

* commit 'a9396549b37d13c518c662c04f6ff42e9ae47c24':
  Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.

fs_mgr/fs_mgr_priv.h

diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h
index e49096f..f961b39 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: