diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/ata/ahci.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/ata/ahci.h')
| -rw-r--r-- | drivers/ata/ahci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index ccaf08122058..39865009c251 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h | |||
| @@ -225,7 +225,7 @@ enum { | |||
| 225 | /* em_ctl bits */ | 225 | /* em_ctl bits */ |
| 226 | EM_CTL_RST = (1 << 9), /* Reset */ | 226 | EM_CTL_RST = (1 << 9), /* Reset */ |
| 227 | EM_CTL_TM = (1 << 8), /* Transmit Message */ | 227 | EM_CTL_TM = (1 << 8), /* Transmit Message */ |
| 228 | EM_CTL_MR = (1 << 0), /* Message Recieved */ | 228 | EM_CTL_MR = (1 << 0), /* Message Received */ |
| 229 | EM_CTL_ALHD = (1 << 26), /* Activity LED */ | 229 | EM_CTL_ALHD = (1 << 26), /* Activity LED */ |
| 230 | EM_CTL_XMT = (1 << 25), /* Transmit Only */ | 230 | EM_CTL_XMT = (1 << 25), /* Transmit Only */ |
| 231 | EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ | 231 | EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ |
| @@ -281,7 +281,7 @@ struct ahci_port_priv { | |||
| 281 | }; | 281 | }; |
| 282 | 282 | ||
| 283 | struct ahci_host_priv { | 283 | struct ahci_host_priv { |
| 284 | void __iomem * mmio; /* bus-independant mem map */ | 284 | void __iomem * mmio; /* bus-independent mem map */ |
| 285 | unsigned int flags; /* AHCI_HFLAG_* */ | 285 | unsigned int flags; /* AHCI_HFLAG_* */ |
| 286 | u32 cap; /* cap to use */ | 286 | u32 cap; /* cap to use */ |
| 287 | u32 cap2; /* cap2 to use */ | 287 | u32 cap2; /* cap2 to use */ |