From 7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 9 Apr 2012 13:39:55 +0000 Subject: 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 --- include/linux/compat.h | 52 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/err.h | 2 +- include/linux/mtd/compat.h | 52 --------------------------------------------- include/linux/mtd/mtd-abi.h | 2 +- include/linux/mtd/nand.h | 2 +- include/linux/mtd/onenand.h | 2 +- include/nand.h | 2 +- 7 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 include/linux/compat.h delete mode 100644 include/linux/mtd/compat.h (limited to 'include') diff --git a/include/linux/compat.h b/include/linux/compat.h new file mode 100644 index 0000000000..39c693f7a8 --- /dev/null +++ b/include/linux/compat.h @@ -0,0 +1,52 @@ +#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/err.h b/include/linux/err.h index 4e08c4fe68..96c0c72baa 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -5,7 +5,7 @@ #if 0 #include #else -#include +#include #endif #include diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h deleted file mode 100644 index 39c693f7a8..0000000000 --- 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 8d5f60c75e..5991157065 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 +#include #endif struct erase_info_user { diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index da6fa184c3..82704de083 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 bb4a4a6b28..e7b63ddd10 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h @@ -17,7 +17,7 @@ /* Note: The header order is impoertant */ #include -#include +#include #include #define MAX_DIES 2 diff --git a/include/nand.h b/include/nand.h index 8b3a1a77a3..a48b1b8ed1 100644 --- a/include/nand.h +++ b/include/nand.h @@ -37,7 +37,7 @@ extern void nand_init(void); -#include +#include #include #include -- cgit v1.2.1