summaryrefslogtreecommitdiff
path: root/include/linux/mtd
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-09 13:39:55 +0000
committerAnatolij Gustschin <agust@denx.de>2012-04-30 16:54:51 +0200
commit7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d (patch)
treec6960f091ffc45942593c82d92297f68138111e2 /include/linux/mtd
parent4e2c05873a7c51b13a8ddf1eeda4dc96c37013c4 (diff)
downloadu-boot-imx-7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d.zip
u-boot-imx-7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d.tar.gz
u-boot-imx-7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d.tar.bz2
linux/compat.h: rename from linux/mtd/compat.h
This lets us use it in more places than just mtd code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/linux/mtd')
-rw-r--r--include/linux/mtd/compat.h52
-rw-r--r--include/linux/mtd/mtd-abi.h2
-rw-r--r--include/linux/mtd/nand.h2
-rw-r--r--include/linux/mtd/onenand.h2
4 files changed, 3 insertions, 55 deletions
diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
deleted file mode 100644
index 39c693f..0000000
--- a/include/linux/mtd/compat.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _LINUX_COMPAT_H_
-#define _LINUX_COMPAT_H_
-
-#define __user
-#define __iomem
-
-#define ndelay(x) udelay(1)
-
-#define printk printf
-
-#define KERN_EMERG
-#define KERN_ALERT
-#define KERN_CRIT
-#define KERN_ERR
-#define KERN_WARNING
-#define KERN_NOTICE
-#define KERN_INFO
-#define KERN_DEBUG
-
-#define kmalloc(size, flags) malloc(size)
-#define kzalloc(size, flags) calloc(size, 1)
-#define vmalloc(size) malloc(size)
-#define kfree(ptr) free(ptr)
-#define vfree(ptr) free(ptr)
-
-#define DECLARE_WAITQUEUE(...) do { } while (0)
-#define add_wait_queue(...) do { } while (0)
-#define remove_wait_queue(...) do { } while (0)
-
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-
-/*
- * ..and if you can't take the strict
- * types, you can specify one yourself.
- *
- * Or not use min/max at all, of course.
- */
-#define min_t(type,x,y) \
- ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
-#define max_t(type,x,y) \
- ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; })
-
-#ifndef BUG
-#define BUG() do { \
- printf("U-Boot BUG at %s:%d!\n", __FILE__, __LINE__); \
-} while (0)
-
-#define BUG_ON(condition) do { if (condition) BUG(); } while(0)
-#endif /* BUG */
-
-#define PAGE_SIZE 4096
-#endif
diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h
index 8d5f60c..5991157 100644
--- a/include/linux/mtd/mtd-abi.h
+++ b/include/linux/mtd/mtd-abi.h
@@ -8,7 +8,7 @@
#define __MTD_ABI_H__
#if 1
-#include <linux/mtd/compat.h>
+#include <linux/compat.h>
#endif
struct erase_info_user {
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index da6fa18..82704de 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -20,7 +20,7 @@
#include "config.h"
-#include "linux/mtd/compat.h"
+#include "linux/compat.h"
#include "linux/mtd/mtd.h"
#include "linux/mtd/bbm.h"
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index bb4a4a6..e7b63dd 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -17,7 +17,7 @@
/* Note: The header order is impoertant */
#include <onenand_uboot.h>
-#include <linux/mtd/compat.h>
+#include <linux/compat.h>
#include <linux/mtd/bbm.h>
#define MAX_DIES 2