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 /arch/arm | |
parent | bf33a70a73876b163d62612e9567cbac6604ba7e (diff) | |
parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 (diff) |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/a.out.h | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/setup.h | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/swab.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/a.out.h b/arch/arm/include/asm/a.out.h index 79489fdcc8b..083894b2e3b 100644 --- a/arch/arm/include/asm/a.out.h +++ b/arch/arm/include/asm/a.out.h @@ -2,7 +2,7 @@ #define __ARM_A_OUT_H__ #include <linux/personality.h> -#include <asm/types.h> +#include <linux/types.h> struct exec { diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index f2cd18a0932..ee1304f22f9 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h @@ -14,7 +14,7 @@ #ifndef __ASMARM_SETUP_H #define __ASMARM_SETUP_H -#include <asm/types.h> +#include <linux/types.h> #define COMMAND_LINE_SIZE 1024 diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h index 27a689be085..ca2bf2f6d6e 100644 --- a/arch/arm/include/asm/swab.h +++ b/arch/arm/include/asm/swab.h @@ -16,7 +16,7 @@ #define __ASM_ARM_SWAB_H #include <linux/compiler.h> -#include <asm/types.h> +#include <linux/types.h> #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) # define __SWAB_64_THRU_32__ |