diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 15:11:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 15:11:54 -0400 |
| commit | 00cda56d39f013cce60f44f1e3da19b87eba5d85 (patch) | |
| tree | 2cfe7bf556562a846ff46a558a31ca1939d2e12c /drivers/ata/pata_ns87415.c | |
| parent | da8e5aa21e037be02e0752e80b9444ff60185a3f (diff) | |
| parent | ab6fc95f609b372a19e18ea689986846ab1ba29c (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] AHCI: fix newly introduced host-reset bug
[libata] sata_nv: fix SWNCQ enabling
libata: add MAXTOR 7V300F0/VA111900 to NCQ blacklist
libata: no need to speed down if already at PIO0
libata: relocate forcing PIO0 on reset
pata_ns87415: define SUPERIO_IDE_MAX_RETRIES
[libata] Address some checkpatch-spotted issues
[libata] fix 'if(' and similar areas that lack whitespace
libata: implement ata_wait_after_reset()
libata: track SLEEP state and issue SRST to wake it up
libata: relocate and fix post-command processing
Diffstat (limited to 'drivers/ata/pata_ns87415.c')
| -rw-r--r-- | drivers/ata/pata_ns87415.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c index b9a17eb100d0..d0e2e50823b1 100644 --- a/drivers/ata/pata_ns87415.c +++ b/drivers/ata/pata_ns87415.c | |||
| @@ -215,6 +215,8 @@ static int ns87415_check_atapi_dma(struct ata_queued_cmd *qc) | |||
| 215 | 215 | ||
| 216 | #include <asm/superio.h> | 216 | #include <asm/superio.h> |
| 217 | 217 | ||
| 218 | #define SUPERIO_IDE_MAX_RETRIES 25 | ||
| 219 | |||
| 218 | /** | 220 | /** |
| 219 | * ns87560_read_buggy - workaround buggy Super I/O chip | 221 | * ns87560_read_buggy - workaround buggy Super I/O chip |
| 220 | * @port: Port to read | 222 | * @port: Port to read |