diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-13 23:53:17 +0300 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-13 23:53:17 +0300 |
| commit | 8960f8c8e779fa405f031ca6866d6d3ab88e2eae (patch) | |
| tree | b0ad8fa2e78ed5bb065e8bc0ccb1fb877aede54f /include/linux/types.h | |
| parent | 9b3651cbc26cfcea8276ecaff66718ea087f2e91 (diff) | |
| parent | 22796b15725488002437ebbf98a22fdbe596cf89 (diff) | |
| download | linux-8960f8c8e779fa405f031ca6866d6d3ab88e2eae.tar.xz | |
Merge commit 'tip/x86/headers' into x86/untangle2
* commit 'tip/x86/headers': (42 commits)
x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
headers_check fix: linux/in6.h
headers_check fix: linux/coda_psdev.h
headers_check fix: xtensa, swab.h
headers_check fix: powerpc, swab.h
headers_check fix: powerpc, spu_info.h
headers_check fix: powerpc, ps3fb.h
headers_check fix: powerpc, kvm.h
headers_check fix: powerpc, elf.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 */ |