U-Boot v1: What are jffs2 changes good for?

In our U-Boot v1 OMAP3 patch set in Steve's git we have the fs/jffs2/jffs2_1pass.c [1] change below. I now wonder what this is good for and if it will be accepted upstream? Any idea?

Thanks

Dirk

Btw.: Seems that there is a typo in "ONFIG_CMD_FLASH", too?

[1] http://www.sakoman.net/cgi-bin/gitweb.cgi?p=u-boot-omap3.git;a=blobdiff;f=fs/jffs2/jffs2_1pass.c;h=e552e0865c9074bda7a8d41711161fdd71c1119b;hp=7e27ee18a2a4fcb6b9b83703f7829eff973f0387;hb=725e452e0700be26ab5f836c284733e18c71c1ec;hpb=8155efbd7ae9c65564ca98affe94631d612ae088

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 7e27ee1..e552e08 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -303,7 +303,9 @@ static inline void *get_node_mem_nor(u32 off)
   */
  static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf)
  {
+#if (defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)) || defined(ONFIG_CMD_FLASH)
    struct mtdids *id = current_part->dev->id;
+#endif

  #if defined(CONFIG_CMD_FLASH)
    if (id->type == MTD_DEV_TYPE_NOR)
@@ -321,7 +323,9 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf)

  static inline void *get_node_mem(u32 off)
  {
- struct mtdids *id = current_part->dev->id;
+#if (defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)) || defined(ONFIG_CMD_FLASH)
+ struct mtdids *id = current_part->dev->id;
+#endif

  #if defined(CONFIG_CMD_FLASH)
    if (id->type == MTD_DEV_TYPE_NOR)

If no one speaks up for that patch, it looks quite reasonable to
exclude it. If 'current_part->dev->id' was off-chip, I could see the
#if preventing lock-ups on bad accesses, but I don't believe that is
the case. It looks like a bad patch to me.