diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /include/linux/libata.h | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 2 |
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) | |||
| 1054 | /** | 1054 | /** |
| 1055 | * ata_busy_wait - Wait for a port status register | 1055 | * ata_busy_wait - Wait for a port status register |
| 1056 | * @ap: Port to wait for. | 1056 | * @ap: Port to wait for. |
| 1057 | * @bits: bits that must be clear | ||
| 1058 | * @max: number of 10uS waits to perform | ||
| 1057 | * | 1059 | * |
| 1058 | * Waits up to max*10 microseconds for the selected bits in the port's | 1060 | * Waits up to max*10 microseconds for the selected bits in the port's |
| 1059 | * status register to be cleared. | 1061 | * status register to be cleared. |