From db543cd7d4d067924d81c9a4947d3be1af119a0e Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 18 May 2011 16:38:06 +0300
Subject: [PATCH] --- yaml --- r: 255087 b: refs/heads/master c:
 18073733247dc0c31e07f3a87f3267fe8d7e7022 h: refs/heads/master i:   255085:
 965509fb7fb4ac5f41419709a69e3ed87f08acd9   255083:
 808cb9814ea710ea97492c4c5b31ee7d2d23dc75   255079:
 03d4af83b190937c3bbceab718ea8bfe938b1b73   255071:
 7d39722b4059bbad9bebbbedb58281750d4cdd65 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mtd/ubi/debug.h | 8 --------
 trunk/drivers/mtd/ubi/ubi.h   | 3 ++-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index f3ba088905a3..cdbc786fc3cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27a0f2a37aa46cb0174decddf8830715e5f1645a
+refs/heads/master: 18073733247dc0c31e07f3a87f3267fe8d7e7022
diff --git a/trunk/drivers/mtd/ubi/debug.h b/trunk/drivers/mtd/ubi/debug.h
index efefc549fee2..ef97c12fe9b8 100644
--- a/trunk/drivers/mtd/ubi/debug.h
+++ b/trunk/drivers/mtd/ubi/debug.h
@@ -21,14 +21,6 @@
 #ifndef __UBI_DEBUG_H__
 #define __UBI_DEBUG_H__
 
-struct ubi_ec_hdr;
-struct ubi_vid_hdr;
-struct ubi_volume;
-struct ubi_vtbl_record;
-struct ubi_scan_volume;
-struct ubi_scan_leb;
-struct ubi_mkvol_req;
-
 #ifdef CONFIG_MTD_UBI_DEBUG
 #include <linux/random.h>
 
diff --git a/trunk/drivers/mtd/ubi/ubi.h b/trunk/drivers/mtd/ubi/ubi.h
index d0e321885fd6..fd19f8d3bce8 100644
--- a/trunk/drivers/mtd/ubi/ubi.h
+++ b/trunk/drivers/mtd/ubi/ubi.h
@@ -44,7 +44,6 @@
 
 #include "ubi-media.h"
 #include "scan.h"
-#include "debug.h"
 
 /* Maximum number of supported UBI devices */
 #define UBI_MAX_DEVICES 32
@@ -478,6 +477,8 @@ struct ubi_device {
 	struct ubi_debug_info *dbg;
 };
 
+#include "debug.h"
+
 extern struct kmem_cache *ubi_wl_entry_slab;
 extern const struct file_operations ubi_ctrl_cdev_operations;
 extern const struct file_operations ubi_cdev_operations;