Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / linux / mtd / ubi.h

diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h
index d9e58aedf6398487b705eed3ea653b80dd4b1b43..05d0ab54c0190eef14f8ae16ef70f757bfe208f9 100644 (file)
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.h
@@ -10,7 +10,6 @@
 #define __LINUX_UBI_H__
 
 #include <linux/types.h>
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/ioctl.h>
 #include <mtd/ubi-user.h>