diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-23 04:57:25 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-23 04:57:25 -0400 |
| commit | e43fe686e48835ca027559a068bbe0b6d264a254 (patch) | |
| tree | def98b52b111ba384a2fd01955465f813ca299e4 /drivers/mtd/ubi/ubi.h | |
| parent | 986ee0139a91ab8b6b07d29d7a112c8033b5f8e0 (diff) | |
| parent | 434b825e1fc9ef7971fc962734278ffbab36a1ab (diff) | |
Merge git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'drivers/mtd/ubi/ubi.h')
| -rw-r--r-- | drivers/mtd/ubi/ubi.h | 3 |
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 @@ | |||
| 37 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| 38 | #include <linux/vmalloc.h> | 38 | #include <linux/vmalloc.h> |
| 39 | #include <linux/mtd/mtd.h> | 39 | #include <linux/mtd/mtd.h> |
| 40 | |||
| 41 | #include <mtd/ubi-header.h> | ||
| 42 | #include <linux/mtd/ubi.h> | 40 | #include <linux/mtd/ubi.h> |
| 43 | 41 | ||
| 42 | #include "ubi-media.h" | ||
| 44 | #include "scan.h" | 43 | #include "scan.h" |
| 45 | #include "debug.h" | 44 | #include "debug.h" |
| 46 | 45 | ||