X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fubi_uboot.h;h=60f6a5fb4f53ed7464f1c5d3d53d088d501ef494;hb=6ab176d7091d21960a1bd89fcb7fd87b9e91aca1;hp=b4152192a2d943a82c1203166f80d80d36cb43b9;hpb=cb5473205206c7f14cbb1e747f28ec75b48826e2;p=oweals%2Fu-boot.git

diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index b4152192a2..60f6a5fb4f 100644
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -15,10 +15,16 @@
 #define __UBOOT_UBI_H
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <div64.h>
 #include <linux/crc32.h>
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/rbtree.h>
+#include <linux/string.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/ubi.h>
 
 #ifdef CONFIG_CMD_ONENAND
 #include <onenand_uboot.h>
@@ -46,9 +52,6 @@ do {									\
 #undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
 #define CONFIG_MTD_UBI_DEBUG_DISABLE_BGT
 
-/* compiler options */
-#define uninitialized_var(x)		x = x
-
 /* build.c */
 #define get_device(...)
 #define put_device(...)
@@ -193,7 +196,7 @@ static inline long IS_ERR(const void *ptr)
 
 /* module */
 #define THIS_MODULE		0
-#define try_module_get(...)	0
+#define try_module_get(...)	1
 #define module_put(...)		do { } while (0)
 #define module_init(...)
 #define module_exit(...)
@@ -206,7 +209,9 @@ static inline long IS_ERR(const void *ptr)
 #define MODULE_AUTHOR(...)
 #define MODULE_LICENSE(...)
 
+#ifndef __UBIFS_H__
 #include "../drivers/mtd/ubi/ubi.h"
+#endif
 
 /* functions */
 extern int ubi_mtd_param_parse(const char *val, struct kernel_param *kp);