Fix libata-acpi.c build failure.

Signed-off-by: Matthew Garrett <[EMAIL PROTECTED]>

--- 

Sorry, I'd diffed the original against libata-dev master rather than 
ALL. This tidies up the changes.

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 6896831..5ebbf16 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -101,7 +101,7 @@ static void ata_acpi_handle_hotplug (struct ata_port *ap, 
struct kobject *kobj,
 {
        char event_string[12];
        char *envp[] = { event_string, NULL };
-       struct ata_eh_info *ehi = &ap->eh_info;
+       struct ata_eh_info *ehi = &ap->link.eh_info;
 
        if (event == 0 || event == 1) {
               unsigned long flags;
@@ -127,7 +127,7 @@ static void ata_acpi_dev_notify(acpi_handle handle, u32 
event, void *data)
        if (dev->sdev)
                kobj = &dev->sdev->sdev_gendev.kobj;
 
-       ata_acpi_handle_hotplug (dev->ap, kobj, event);
+       ata_acpi_handle_hotplug (dev->link->ap, kobj, event);
 }
 
 static void ata_acpi_ap_notify(acpi_handle handle, u32 event, void *data)
@@ -175,8 +175,8 @@ void ata_acpi_associate(struct ata_host *host)
                                                     ata_acpi_ap_notify,
                                                     ap);
 
-               for (j = 0; j < ata_port_max_devices(ap); j++) {
-                       struct ata_device *dev = &ap->device[j];
+               for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
+                       struct ata_device *dev = &ap->link.device[j];
 
                        if (dev->acpi_handle)
                                acpi_install_notify_handler (dev->acpi_handle,

-- 
Matthew Garrett | [EMAIL PROTECTED]
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to