Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / include / asm-arm / cpu.h

diff --git a/include/asm-arm/cpu.h b/include/asm-arm/cpu.h
index fcbdd40cb66773da5638c8f640877bec2140b890..715426b9b08ef355728a7ce9ebde64b5d522ce14 100644 (file)
--- a/include/asm-arm/cpu.h
+++ b/include/asm-arm/cpu.h
@@ -10,12 +10,12 @@
 #ifndef __ASM_ARM_CPU_H
 #define __ASM_ARM_CPU_H
 
-#include <linux/config.h>
 #include <linux/percpu.h>
 
 struct cpuinfo_arm {
        struct cpu      cpu;
 #ifdef CONFIG_SMP
+       struct task_struct *idle;
        unsigned int    loops_per_jiffy;
 #endif
 };