diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-14 06:22:41 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-14 06:22:41 +0300 |
| commit | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (patch) | |
| tree | 6b0290f0cb5f019b792df8580a73f0f852a4e856 /include | |
| parent | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (diff) | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
| download | linux-e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5.tar.xz | |
Merge branch 'upstream'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/sal.h | 3 | ||||
| -rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 3 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 { typedef struct sal_log_record_header { u64 id; /* Unique monotonically increasing ID */ sal_log_revision_t revision; /* Major and Minor revision of header */ - u16 severity; /* Error Severity */ + u8 severity; /* Error Severity */ + u8 validation_bits; /* 0: platform_guid, 1: !timestamp */ u32 len; /* Length of this error log in bytes */ sal_log_timestamp_t timestamp; /* Timestamp */ efi_guid_t platform_guid; /* Unique OEM Platform ID */ diff --git a/include/linux/libata.h b/include/linux/libata.h index 46337e71613e..e828e172ccbf 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -122,6 +122,7 @@ enum { ATA_FLAG_NOINTR = (1 << 9), /* FIXME: Remove this once * proper HSM is in place. */ ATA_FLAG_DEBUGMSG = (1 << 10), + ATA_FLAG_NO_ATAPI = (1 << 11), /* No ATAPI support */ ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ |