diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /arch/arm/include/asm/a.out.h | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'arch/arm/include/asm/a.out.h')
| -rw-r--r-- | arch/arm/include/asm/a.out.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/a.out.h b/arch/arm/include/asm/a.out.h index 79489fdcc8b8..083894b2e3bc 100644 --- a/arch/arm/include/asm/a.out.h +++ b/arch/arm/include/asm/a.out.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define __ARM_A_OUT_H__ | 2 | #define __ARM_A_OUT_H__ |
| 3 | 3 | ||
| 4 | #include <linux/personality.h> | 4 | #include <linux/personality.h> |
| 5 | #include <asm/types.h> | 5 | #include <linux/types.h> |
| 6 | 6 | ||
| 7 | struct exec | 7 | struct exec |
| 8 | { | 8 | { |