Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index c0c73913833df3f401499ac2ec6f867ce388404f..2e7a3bf13824945ac18ff54187146585e03d31f6 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -354,7 +354,7 @@ static struct pci_platform_pm_ops acpi_pci_platform_pm = {
 static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
 {
        struct pci_dev * pci_dev;
-       acpi_integer    addr;
+       u64     addr;
 
        pci_dev = to_pci_dev(dev);
        /* Please ref to ACPI spec for the syntax of _ADR */