diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/ata/libata.h | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/ata/libata.h')
| -rw-r--r-- | drivers/ata/libata.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index be8e2628f82c..823e63096362 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
| @@ -118,6 +118,8 @@ extern void ata_lpm_schedule(struct ata_port *ap, enum link_pm); | |||
| 118 | 118 | ||
| 119 | /* libata-acpi.c */ | 119 | /* libata-acpi.c */ |
| 120 | #ifdef CONFIG_ATA_ACPI | 120 | #ifdef CONFIG_ATA_ACPI |
| 121 | extern unsigned int ata_acpi_gtf_filter; | ||
| 122 | |||
| 121 | extern void ata_acpi_associate_sata_port(struct ata_port *ap); | 123 | extern void ata_acpi_associate_sata_port(struct ata_port *ap); |
| 122 | extern void ata_acpi_associate(struct ata_host *host); | 124 | extern void ata_acpi_associate(struct ata_host *host); |
| 123 | extern void ata_acpi_dissociate(struct ata_host *host); | 125 | extern void ata_acpi_dissociate(struct ata_host *host); |