diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-01 00:17:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-01 00:17:23 -0500 |
| commit | 30574b61611ccd29677989097f8c8a5d9a73d873 (patch) | |
| tree | 8385fb5018037402db9adb727b9755bc5b43ac92 /include | |
| parent | 0ca43235b34c92278fa903297acef37198ec3e26 (diff) | |
| parent | c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 (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:
[PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M
[PATCH] libata: unexport ata_dev_revalidate()
[PATCH] Add 0x7110 piix to ata_piix.c
[PATCH] sata_sis: fix flags handling for the secondary port
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index b03d5a340d..abd2debebc 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -702,7 +702,6 @@ extern int ata_std_prereset(struct ata_port *ap); | |||
| 702 | extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes); | 702 | extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes); |
| 703 | extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class); | 703 | extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class); |
| 704 | extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes); | 704 | extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes); |
| 705 | extern int ata_dev_revalidate(struct ata_device *dev, int post_reset); | ||
| 706 | extern void ata_port_disable(struct ata_port *); | 705 | extern void ata_port_disable(struct ata_port *); |
| 707 | extern void ata_std_ports(struct ata_ioports *ioaddr); | 706 | extern void ata_std_ports(struct ata_ioports *ioaddr); |
| 708 | #ifdef CONFIG_PCI | 707 | #ifdef CONFIG_PCI |