diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 14:41:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 14:41:00 -0700 |
| commit | ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc (patch) | |
| tree | 32d5f592be4222f0d6a8a05fcbc1c2eaed729499 /drivers/ata/pata_netcell.c | |
| parent | 1f9bd4c96a8e918a86e083706e0d3eb7f030b9a3 (diff) | |
| parent | bda3028813bd07f34f30288a492fbf6f7b8712dd (diff) | |
| download | kernel-crypto-ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc.tar.gz kernel-crypto-ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc.tar.xz kernel-crypto-ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc.zip | |
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] Don't use old-EH ->eng_timeout() hook when not needed
[libata] sata_mv: fix oops by filling in missing hook
[libata] One more s/15/ATA_SECONDARY_IRQ/ substitution
[libata] pata_serverworks: fill in ->irq_clear hook
[PATCH] pata_serverworks: correct PCI ID in cable detection table
[PATCH] libata-sff: use our IRQ defines
[PATCH] libata-eh: Remove layering violation and duplication when handling absent ports
[PATCH] libata: tighten rules for legacy dependancies
[PATCH] libata: refuse to register IRQless ports
Diffstat (limited to 'drivers/ata/pata_netcell.c')
| -rw-r--r-- | drivers/ata/pata_netcell.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c index 16cb254cb97..76eb9c90bee 100644 --- a/drivers/ata/pata_netcell.c +++ b/drivers/ata/pata_netcell.c @@ -90,8 +90,7 @@ static const struct ata_port_operations netcell_ops = { .qc_issue = ata_qc_issue_prot, .data_xfer = ata_pio_data_xfer, - /* Timeout handling. Special recovery hooks here */ - .eng_timeout = ata_eng_timeout, + /* IRQ-related hooks */ .irq_handler = ata_interrupt, .irq_clear = ata_bmdma_irq_clear, |