diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /include/linux/types.h | |
| parent | x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined (diff) | |
| parent | unconditionally include asm/types.h from linux/types.h (diff) | |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Diffstat (limited to 'include/linux/types.h')
| -rw-r--r-- | include/linux/types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 712ca53bc348..fca82ed55f49 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -1,6 +1,9 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H +#include <asm/types.h> + +#ifndef __ASSEMBLY__ #ifdef __KERNEL__ #define DECLARE_BITMAP(name,bits) \ @@ -9,7 +12,6 @@ #endif #include <linux/posix_types.h> -#include <asm/types.h> #ifndef __KERNEL_STRICT_NAMES @@ -212,5 +214,5 @@ struct ustat { }; #endif /* __KERNEL__ */ - +#endif /* __ASSEMBLY__ */ #endif /* _LINUX_TYPES_H */ |