mmc: omap_hsmmc: enable 8bit interface for eMMC for AM43xx

[karo-tx-uboot.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index dd9b668ee763f9b1d17cb8520b75af99f6bc3610..10f8fff0be6f7c1cb4bbecdfc673174901c72e28 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -15,7 +15,6 @@
  * corresponding subsystems, but most of it is here.
  */
 
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -1050,7 +1049,6 @@ static void free_orphans(struct ubifs_info *c)
        c->orph_buf = NULL;
 }
 
-#ifndef __UBOOT__
 /**
  * free_buds - free per-bud objects.
  * @c: UBIFS file-system description object
@@ -1062,7 +1060,6 @@ static void free_buds(struct ubifs_info *c)
        rbtree_postorder_for_each_entry_safe(bud, n, &c->buds, rb)
                kfree(bud);
 }
-#endif
 
 /**
  * check_volume_empty - check if the UBI volume is empty.
@@ -1243,6 +1240,7 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
 
        return 0;
 }
+#endif
 
 /**
  * destroy_journal - destroy journal data structures.
@@ -1273,7 +1271,6 @@ static void destroy_journal(struct ubifs_info *c)
        ubifs_tnc_close(c);
        free_buds(c);
 }
-#endif
 
 /**
  * bu_init - initialize bulk-read information.
@@ -1503,11 +1500,9 @@ static int mount_ubifs(struct ubifs_info *c)
        if (err)
                goto out_lpt;
 
-#ifndef __UBOOT__
        err = ubifs_replay_journal(c);
        if (err)
                goto out_journal;
-#endif
 
        /* Calculate 'min_idx_lebs' after journal replay */
        c->bi.min_idx_lebs = ubifs_calc_min_idx_lebs(c);
@@ -1679,10 +1674,8 @@ out_infos:
        spin_unlock(&ubifs_infos_lock);
 out_orphans:
        free_orphans(c);
-#ifndef __UBOOT__
 out_journal:
        destroy_journal(c);
-#endif
 out_lpt:
        ubifs_lpt_free(c, 0);
 out_master: