diff options
| author | Nick Kralevich <nnk@google.com> | 2014-01-15 07:48:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 07:48:15 +0000 |
| commit | c318fb405b73f4865c4b4156d181ff6edad490bd (patch) | |
| tree | 74ba9cef78d4ac20c10d165811082b4a1307e131 | |
| parent | 11268294f319a39e1e05271ccd48d97f52dc3a00 (diff) | |
| parent | 7a2c2e8048cc6bba9b78be8a01c0b056b5548718 (diff) | |
| download | system_core-c318fb405b73f4865c4b4156d181ff6edad490bd.zip system_core-c318fb405b73f4865c4b4156d181ff6edad490bd.tar.gz system_core-c318fb405b73f4865c4b4156d181ff6edad490bd.tar.bz2 | |
am 7a2c2e80: am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""
* commit '7a2c2e8048cc6bba9b78be8a01c0b056b5548718':
Revert "fs_mgr: correct warning on unused function parameter"
| -rw-r--r-- | fs_mgr/fs_mgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 2ba8017..6d9d20c 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -821,7 +821,7 @@ int fs_mgr_get_crypt_info(struct fstab *fstab, char *key_loc, char *real_blk_dev /* Add an entry to the fstab, and return 0 on success or -1 on error */ int fs_mgr_add_entry(struct fstab *fstab, const char *mount_point, const char *fs_type, - const char *blk_device, long long length __attribute__(unused)) + const char *blk_device, long long length) { struct fstab_rec *new_fstab_recs; int n = fstab->num_entries; |