eNET: Fix Flash Write

[karo-tx-uboot.git] / include / ubi_uboot.h

diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index 095dfc1b206a0e56f90fef961c52ae9cbdc14a6a..60f6a5fb4f53ed7464f1c5d3d53d088d501ef494 100644 (file)
--- 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(...)
@@ -56,7 +59,7 @@ do {                                                                  \
 #define ubi_sysfs_close(...)           do { } while (0)
 static inline int is_power_of_2(unsigned long n)
 {
-        return (n != 0 && ((n & (n - 1)) == 0));
+       return (n != 0 && ((n & (n - 1)) == 0));
 }
 
 /* FIXME */
@@ -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);