diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 16:11:51 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 16:11:51 -0800 |
| commit | 638bee71c83a2837b48062fdc5b222163cf53d79 (patch) | |
| tree | 9c1699c07a5aa547d769138317279b8ee1ba89e8 /arch/alpha/include | |
| parent | 2aaa822984b97efd894d10d1e1382206ef0291a7 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'arch/alpha/include')
| -rw-r--r-- | arch/alpha/include/asm/statfs.h | 2 | ||||
| -rw-r--r-- | arch/alpha/include/asm/swab.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/statfs.h b/arch/alpha/include/asm/statfs.h index de35cd438a1..ccd2e186bfd 100644 --- a/arch/alpha/include/asm/statfs.h +++ b/arch/alpha/include/asm/statfs.h @@ -1,6 +1,8 @@ #ifndef _ALPHA_STATFS_H #define _ALPHA_STATFS_H +#include <linux/types.h> + /* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't even seem to implement statfs64 */ #define __statfs_word __u32 diff --git a/arch/alpha/include/asm/swab.h b/arch/alpha/include/asm/swab.h index 68e7089e02d..4d682b16c7c 100644 --- a/arch/alpha/include/asm/swab.h +++ b/arch/alpha/include/asm/swab.h @@ -1,7 +1,7 @@ #ifndef _ALPHA_SWAB_H #define _ALPHA_SWAB_H -#include <asm/types.h> +#include <linux/types.h> #include <linux/compiler.h> #include <asm/compiler.h> |