diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-20 20:19:38 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-20 20:19:38 +0000 |
| commit | 82b5df7bf27ca6cf642499bc3bcae1c93b9ac4ba (patch) | |
| tree | 2534270745a4f4998eb099dd540780806250a4d7 /arch/arm/include | |
| parent | e38eb34aab13a81b91400c75c703252473100bc4 (diff) | |
| parent | b4b8f770eb10a1bccaf8aa0ec1956e2dd7ed1e0a (diff) | |
| download | linux-82b5df7bf27ca6cf642499bc3bcae1c93b9ac4ba.tar.bz2 | |
Merge branch 'bl-cpuinfo' of git://linux-arm.org/linux-2.6-lp into devel-stable
Diffstat (limited to 'arch/arm/include')
| -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 d797223b39d5..2744f0602550 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 |