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
2026-09-16 18:15:52 +00:00 · 2006-09-27 14:41:00 -07:00 · 2006-09-27 14:41:00 -07:00 · ac7f6b5e44
commit ac7f6b5e44
parent 1f9bd4c96a bda3028813
43 changed files with 138 additions and 188 deletions
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c