diff options
author | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
commit | 7f641d53bbb3a426a3bfb132d8346153e86a9d08 (patch) | |
tree | e59a0aef74c8742a30a611342d39d7bfe06854dd /fs/ubifs/tnc.c | |
parent | 112db9407dd338f71200beb0fc99dffa8dcb57a8 (diff) | |
parent | 040cc7b3beedecd971274a065564e39aac7fc76e (diff) | |
download | u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.zip u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.gz u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
Diffstat (limited to 'fs/ubifs/tnc.c')
-rw-r--r-- | fs/ubifs/tnc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 95cae54..e20cedd 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -2827,7 +2827,6 @@ out_unlock: return ERR_PTR(err); } -#ifndef __UBOOT__ /** * tnc_destroy_cnext - destroy left-over obsolete znodes from a failed commit. * @c: UBIFS file-system description object @@ -2869,7 +2868,6 @@ void ubifs_tnc_close(struct ubifs_info *c) kfree(c->ilebs); destroy_old_idx(c); } -#endif /** * left_znode - get the znode to the left. |