diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 15:36:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 15:36:54 -0500 |
| commit | 65ab592dc5b34caebabfe1340e7c18f52a785079 (patch) | |
| tree | 568e8ed84290c32551e69b2e001758f8c1178ad8 | |
| parent | 0910b444bcd7ea7f437a3ff48e0e3d2495ead22e (diff) | |
| parent | eed66cfcbbea851c97e287440d940286fce3f829 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
| -rw-r--r-- | include/asm-ia64/sal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h index 29df88bdd2bc..313cad0628d0 100644 --- a/include/asm-ia64/sal.h +++ b/include/asm-ia64/sal.h | |||
| @@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { | |||
| 320 | typedef struct sal_log_record_header { | 320 | typedef struct sal_log_record_header { |
| 321 | u64 id; /* Unique monotonically increasing ID */ | 321 | u64 id; /* Unique monotonically increasing ID */ |
| 322 | sal_log_revision_t revision; /* Major and Minor revision of header */ | 322 | sal_log_revision_t revision; /* Major and Minor revision of header */ |
| 323 | u16 severity; /* Error Severity */ | 323 | u8 severity; /* Error Severity */ |
| 324 | u8 validation_bits; /* 0: platform_guid, 1: !timestamp */ | ||
| 324 | u32 len; /* Length of this error log in bytes */ | 325 | u32 len; /* Length of this error log in bytes */ |
| 325 | sal_log_timestamp_t timestamp; /* Timestamp */ | 326 | sal_log_timestamp_t timestamp; /* Timestamp */ |
| 326 | efi_guid_t platform_guid; /* Unique OEM Platform ID */ | 327 | efi_guid_t platform_guid; /* Unique OEM Platform ID */ |