diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /include/linux/cper.h | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'include/linux/cper.h')
| -rw-r--r-- | include/linux/cper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h index 372a25839fd1..c23049496531 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h | |||
| @@ -310,7 +310,7 @@ struct cper_sec_proc_ia { | |||
| 310 | __u8 cpuid[48]; | 310 | __u8 cpuid[48]; |
| 311 | }; | 311 | }; |
| 312 | 312 | ||
| 313 | /* IA32/X64 Processor Error Infomation Structure */ | 313 | /* IA32/X64 Processor Error Information Structure */ |
| 314 | struct cper_ia_err_info { | 314 | struct cper_ia_err_info { |
| 315 | uuid_le err_type; | 315 | uuid_le err_type; |
| 316 | __u64 validation_bits; | 316 | __u64 validation_bits; |