1 files changed, 3 insertions, 3 deletions

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 2326790b7d8b..9e4938d8ca4d 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -436,9 +436,9 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
         if (!controller)
                 return NULL;
 
-        controller->acpi_handle = device->handle;
+        controller->companion = device;
 
-        pxm = acpi_get_pxm(controller->acpi_handle);
+        pxm = acpi_get_pxm(device->handle);
 #ifdef CONFIG_NUMA
         if (pxm >= 0)
                 controller->node = pxm_to_node(pxm);
@@ -489,7 +489,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
 {
         struct pci_controller *controller = bridge->bus->sysdata;
 
-        ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);
+        ACPI_COMPANION_SET(&bridge->dev, controller->companion);
         return 0;
 }