diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-11 10:01:53 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-11 10:01:53 +0000 |
| commit | 0fa5d3996dbda1ee9653c43d39b7ef159fb57ee7 (patch) | |
| tree | 70f0adc3b86bb1511be6607c959506f6365fc2a9 /arch/arm/include/asm/cpu.h | |
| parent | 0b99cb73105f0527c1c4096960796b8772343a39 (diff) | |
| parent | 14318efb322e2fe1a034c69463d725209eb9d548 (diff) | |
Merge branch 'devel-stable' into for-linus
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 d797223b39d..2744f060255 100644 --- a/arch/arm/include/asm/cpu.h +++ b/arch/arm/include/asm/cpu.h @@ -15,6 +15,7 @@ struct cpuinfo_arm { struct cpu cpu; + u32 cpuid; #ifdef CONFIG_SMP unsigned int loops_per_jiffy; #endif |