This file already has lots of type declarations so it seems better to put all of them there.
Move them.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: - Drop duplicate uchar in linux/types.h
include/common.h | 5 ----- include/linux/types.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/common.h b/include/common.h index 7bb18c572e..4ee14f78d0 100644 --- a/include/common.h +++ b/include/common.h @@ -15,11 +15,6 @@
#ifndef __ASSEMBLY__ /* put C only stuff in this section */
-typedef unsigned char uchar; -typedef volatile unsigned long vu_long; -typedef volatile unsigned short vu_short; -typedef volatile unsigned char vu_char; - #include <config.h> #include <errno.h> #include <time.h> diff --git a/include/linux/types.h b/include/linux/types.h index bd912bcb42..baa2c491ea 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -163,4 +163,8 @@ struct ustat { #define DECLARE_BITMAP(name, bits) \ unsigned long name[BITS_TO_LONGS(bits)]
+typedef volatile unsigned long vu_long; +typedef volatile unsigned short vu_short; +typedef volatile unsigned char vu_char; + #endif /* _LINUX_TYPES_H */