diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/ata/libata-acpi.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/ata/libata-acpi.c')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 8b5ea399a4f4..a791b8ce6294 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -660,8 +660,7 @@ static int ata_acpi_filter_tf(struct ata_device *dev, | |||
| 660 | * @dev: target ATA device | 660 | * @dev: target ATA device |
| 661 | * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7) | 661 | * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7) |
| 662 | * | 662 | * |
| 663 | * Outputs ATA taskfile to standard ATA host controller using MMIO | 663 | * Outputs ATA taskfile to standard ATA host controller. |
| 664 | * or PIO as indicated by the ATA_FLAG_MMIO flag. | ||
| 665 | * Writes the control, feature, nsect, lbal, lbam, and lbah registers. | 664 | * Writes the control, feature, nsect, lbal, lbam, and lbah registers. |
| 666 | * Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect, | 665 | * Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect, |
| 667 | * hob_lbal, hob_lbam, and hob_lbah. | 666 | * hob_lbal, hob_lbam, and hob_lbah. |