summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/cpu.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-01 10:55:20 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-01 10:55:20 +0300
commit35858adbfca13678af99fb31618ef4428d6dedb0 (patch)
tree3336feaa61324486945816cb52c347733e7c0821 /arch/arm/include/asm/cpu.h
parent197d4db752e67160d79fed09968c2140376a80a3 (diff)
parent4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff)
downloadlinux-35858adbfca13678af99fb31618ef4428d6dedb0.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/arm/include/asm/cpu.h')
-rw-r--r--arch/arm/include/asm/cpu.h1
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 @@
#define __ASM_ARM_CPU_H
#include <linux/percpu.h>
+#include <linux/cpu.h>
struct cpuinfo_arm {
struct cpu cpu;