diff options
| author | Nick Kralevich <nnk@google.com> | 2014-01-15 06:32:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 06:32:54 +0000 |
| commit | 7a2c2e8048cc6bba9b78be8a01c0b056b5548718 (patch) | |
| tree | 458a48e5de0cd30b8c35dd83f110dcd6ff744e9d | |
| parent | f6070528844d41d70b22461df85e5a714e5f9924 (diff) | |
| parent | aa25204f43421fe363238176d74e68eb8cdb5b01 (diff) | |
| download | system_core-7a2c2e8048cc6bba9b78be8a01c0b056b5548718.zip system_core-7a2c2e8048cc6bba9b78be8a01c0b056b5548718.tar.gz system_core-7a2c2e8048cc6bba9b78be8a01c0b056b5548718.tar.bz2 | |
am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""
* commit 'aa25204f43421fe363238176d74e68eb8cdb5b01':
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; |