summaryrefslogtreecommitdiffstats
path: root/include/common.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/include/common.h b/include/common.h
index 2fbb3cd6cd..699d971743 100644
--- a/include/common.h
+++ b/include/common.h
@@ -25,12 +25,12 @@
#define __COMMON_H_ 1
#include <stdio.h>
-#include <linux/compiler.h>
#include <module.h>
#include <config.h>
#include <linux/bitops.h>
#include <linux/types.h>
#include <linux/string.h>
+#include <linux/kernel.h>
#include <asm/common.h>
#ifdef DEBUG
@@ -52,18 +52,6 @@ typedef void (interrupt_handler_t)(void *);
#include <asm/u-boot.h> /* boot information for Linux kernel */
/*
- * General Purpose Utilities
- */
-#define min(X, Y) \
- ({ typeof (X) __x = (X), __y = (Y); \
- (__x < __y) ? __x : __y; })
-
-#define max(X, Y) \
- ({ typeof (X) __x = (X), __y = (Y); \
- (__x > __y) ? __x : __y; })
-
-
-/*
* Function Prototypes
*/
void reginfo(void);