aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinderrajput@gmail.com>2009-02-08 00:30:25 -0500
committerIngo Molnar <mingo@elte.hu>2009-03-26 13:14:12 -0400
commit9d50638bae05ab7f62d700c9e4a83a1845cf9ef4 (patch)
tree9d614226879ca8802a702deb79d8b74f05278071 /include/linux
parentf6c727813e03ce0f58d73808da8c9a6bc227249e (diff)
unconditionally include asm/types.h from linux/types.h
Reported-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/types.h b/include/linux/types.h
index c30973ace890..fca82ed55f49 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,8 @@
1#ifndef _LINUX_TYPES_H 1#ifndef _LINUX_TYPES_H
2#define _LINUX_TYPES_H 2#define _LINUX_TYPES_H
3 3
4#include <asm/types.h>
5
4#ifndef __ASSEMBLY__ 6#ifndef __ASSEMBLY__
5#ifdef __KERNEL__ 7#ifdef __KERNEL__
6 8
@@ -10,7 +12,6 @@
10#endif 12#endif
11 13
12#include <linux/posix_types.h> 14#include <linux/posix_types.h>
13#include <asm/types.h>
14 15
15#ifndef __KERNEL_STRICT_NAMES 16#ifndef __KERNEL_STRICT_NAMES
16 17