diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:36:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:36:22 -0500 |
| commit | bc535154137601400ffe44c2a7be047ca041fe06 (patch) | |
| tree | 1b6ad05ec2a458d44a384aa90b2ef914c6ce4d52 /drivers/ata | |
| parent | d03ab7ff335b7fbf48d0fd28ead5d7957798510b (diff) | |
| parent | 439913fffd39374c3737186b22d2d56c3a0ae526 (diff) | |
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: replace acpi_integer by u64
ACPICA: Update version to 20100121.
ACPICA: Remove unused uint32_struct type
ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
ACPICA: Predefined name repair: fix NULL package elements
ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
ACPICA: Update all ACPICA copyrights and signons to 2010
ACPICA: Update for new gcc-4 warning options
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 1245838ac13d..292fdbc0431a 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -64,7 +64,7 @@ void ata_acpi_associate_sata_port(struct ata_port *ap) | |||
| 64 | WARN_ON(!(ap->flags & ATA_FLAG_ACPI_SATA)); | 64 | WARN_ON(!(ap->flags & ATA_FLAG_ACPI_SATA)); |
| 65 | 65 | ||
| 66 | if (!sata_pmp_attached(ap)) { | 66 | if (!sata_pmp_attached(ap)) { |
| 67 | acpi_integer adr = SATA_ADR(ap->port_no, NO_PORT_MULT); | 67 | u64 adr = SATA_ADR(ap->port_no, NO_PORT_MULT); |
| 68 | 68 | ||
| 69 | ap->link.device->acpi_handle = | 69 | ap->link.device->acpi_handle = |
| 70 | acpi_get_child(ap->host->acpi_handle, adr); | 70 | acpi_get_child(ap->host->acpi_handle, adr); |
| @@ -74,7 +74,7 @@ void ata_acpi_associate_sata_port(struct ata_port *ap) | |||
| 74 | ap->link.device->acpi_handle = NULL; | 74 | ap->link.device->acpi_handle = NULL; |
| 75 | 75 | ||
| 76 | ata_for_each_link(link, ap, EDGE) { | 76 | ata_for_each_link(link, ap, EDGE) { |
| 77 | acpi_integer adr = SATA_ADR(ap->port_no, link->pmp); | 77 | u64 adr = SATA_ADR(ap->port_no, link->pmp); |
| 78 | 78 | ||
| 79 | link->device->acpi_handle = | 79 | link->device->acpi_handle = |
| 80 | acpi_get_child(ap->host->acpi_handle, adr); | 80 | acpi_get_child(ap->host->acpi_handle, adr); |