diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/arm/include/asm/cpu.h | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'arch/arm/include/asm/cpu.h')
| -rw-r--r-- | arch/arm/include/asm/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cpu.h b/arch/arm/include/asm/cpu.h index 634b2d7c612a..793968173bef 100644 --- a/arch/arm/include/asm/cpu.h +++ b/arch/arm/include/asm/cpu.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #define __ASM_ARM_CPU_H | 11 | #define __ASM_ARM_CPU_H |
| 12 | 12 | ||
| 13 | #include <linux/percpu.h> | 13 | #include <linux/percpu.h> |
| 14 | #include <linux/cpu.h> | ||
| 14 | 15 | ||
| 15 | struct cpuinfo_arm { | 16 | struct cpuinfo_arm { |
| 16 | struct cpu cpu; | 17 | struct cpu cpu; |