path: root/include/linux/libata.h
diff options
authorLinus Torvalds <>2007-02-02 09:14:48 -0800
committerLinus Torvalds <>2007-02-02 09:14:48 -0800
commite47fddf2470feb228e1d3ff41fc78dad4cfbbcc6 (patch)
treebe16dc950dda26f44aaa09455879acbca7efbcae /include/linux/libata.h
parent222335b755726f539c4a056ce119e017aa4166c4 (diff)
parent49c8042996c84f0df6c49ea2e28a7ef38cd7d773 (diff)
Merge branch 'upstream-linus' of
* 'upstream-linus' of libata: Initialize nbytes for internal sg commands libata: Fix ata_busy_wait() kernel docs pata_via: Correct missing comments pata_atiixp: propogate cable detection hack from drivers/ide to the new driver ahci/pata_jmicron: fix JMicron quirk
Diffstat (limited to 'include/linux/libata.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 22aa69e20905..91bb8ceef0b5 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1054,6 +1054,8 @@ static inline void ata_pause(struct ata_port *ap)
* ata_busy_wait - Wait for a port status register
* @ap: Port to wait for.
+ * @bits: bits that must be clear
+ * @max: number of 10uS waits to perform
* Waits up to max*10 microseconds for the selected bits in the port's
* status register to be cleared.