summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/ubi.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-04-23 09:57:25 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2008-04-23 09:57:25 +0100
commite43fe686e48835ca027559a068bbe0b6d264a254 (patch)
treedef98b52b111ba384a2fd01955465f813ca299e4 /drivers/mtd/ubi/ubi.h
parent986ee0139a91ab8b6b07d29d7a112c8033b5f8e0 (diff)
parent434b825e1fc9ef7971fc962734278ffbab36a1ab (diff)
downloadblackbird-op-linux-e43fe686e48835ca027559a068bbe0b6d264a254.tar.gz
blackbird-op-linux-e43fe686e48835ca027559a068bbe0b6d264a254.zip
Merge git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'drivers/mtd/ubi/ubi.h')
-rw-r--r--drivers/mtd/ubi/ubi.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 8f095cb87108..67dcbd11c15c 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -37,10 +37,9 @@
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/mtd/mtd.h>
-
-#include <mtd/ubi-header.h>
#include <linux/mtd/ubi.h>
+#include "ubi-media.h"
#include "scan.h"
#include "debug.h"
OpenPOWER on IntegriCloud