Merge branch 'acpi-pci-hotplug' into acpi-hotplug

diff --combined drivers/pci/hotplug/acpiphp_glue.c
index 67be6bab753599e8dfcaf99b92a729139f288871,438a4d09958baa26d1d6c670fb6d75bd588e0614..ec4ddae1fb54a68641bf4e4b90e6cbec2def6814
--- 1/drivers/pci/hotplug/acpiphp_glue.c
--- 2/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -279,7 -279,9 +279,9 @@@ static acpi_status register_slot(acpi_h
  
        status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
        if (ACPI_FAILURE(status)) {
-               acpi_handle_warn(handle, "can't evaluate _ADR (%#x)\n", status);
+               if (status != AE_NOT_FOUND)
+                       acpi_handle_warn(handle,
+                               "can't evaluate _ADR (%#x)\n", status);
                return AE_OK;
        }
  
@@@ -489,7 -491,7 +491,7 @@@ static void acpiphp_bus_add(acpi_handl
  
        acpi_bus_scan(handle);
        acpi_bus_get_device(handle, &adev);
 -      if (adev)
 +      if (acpi_device_enumerated(adev))
                acpi_device_set_power(adev, ACPI_STATE_D0);
  }