diff options
| author | James Morris <jmorris@namei.org> | 2011-05-19 18:51:57 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-19 18:51:57 +1000 |
| commit | 12a5a2621b1ee14d32beca35304d7c6076a58815 (patch) | |
| tree | 213e13f99de690b3c4a510f504393b63ada626bd /drivers/ata/ahci.h | |
| parent | e77dc3460fa59be5759e9327ad882868eee9d61b (diff) | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
| download | linux-12a5a2621b1ee14d32beca35304d7c6076a58815.tar.bz2 | |
Merge branch 'master' into next
Conflicts:
include/linux/capability.h
Manually resolve merge conflict w/ thanks to Stephen Rothwell.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/ata/ahci.h')
| -rw-r--r-- | drivers/ata/ahci.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 39865009c251..12c5282e7fca 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -229,6 +229,10 @@ enum { EM_CTL_ALHD = (1 << 26), /* Activity LED */ EM_CTL_XMT = (1 << 25), /* Transmit Only */ EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ + EM_CTL_SGPIO = (1 << 19), /* SGPIO messages supported */ + EM_CTL_SES = (1 << 18), /* SES-2 messages supported */ + EM_CTL_SAFTE = (1 << 17), /* SAF-TE messages supported */ + EM_CTL_LED = (1 << 16), /* LED messages supported */ /* em message type */ EM_MSG_TYPE_LED = (1 << 0), /* LED */ |