aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-06 08:36:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-06 08:36:31 -0700
commitab195c58b864802c15e494f06ae109413e12d50b (patch)
tree7b86a6c2a673323b0a90cae227f9fc023eb5b3ff /include
parentcb4361c1dc29cd870f664c004b1817106fbce0fa (diff)
parent445d211b0da4e9a6e6d576edff85085c2aaf53df (diff)
downloadmrst-s0i3-test-ab195c58b864802c15e494f06ae109413e12d50b.tar.gz
mrst-s0i3-test-ab195c58b864802c15e494f06ae109413e12d50b.tar.xz
mrst-s0i3-test-ab195c58b864802c15e494f06ae109413e12d50b.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: unlock HPA if device shrunk libata: disable NCQ on Crucial C300 SSD libata: don't whine on spurious IRQ
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index f8ea71e6d0e..b2f2003b92e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -146,6 +146,7 @@ enum {
ATA_DFLAG_SLEEPING = (1 << 15), /* device is sleeping */
ATA_DFLAG_DUBIOUS_XFER = (1 << 16), /* data transfer not verified */
ATA_DFLAG_NO_UNLOAD = (1 << 17), /* device doesn't support unload */
+ ATA_DFLAG_UNLOCK_HPA = (1 << 18), /* unlock HPA */
ATA_DFLAG_INIT_MASK = (1 << 24) - 1,
ATA_DFLAG_DETACH = (1 << 24),