diff --git a/[refs] b/[refs] index 9305bf3e555a..bc837595eb4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8206b925fb0eba3a11839419be118b09105d7b1 +refs/heads/master: fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff diff --git a/trunk/include/linux/pci-acpi.h b/trunk/include/linux/pci-acpi.h index 479d9bb88e11..44623500f419 100644 --- a/trunk/include/linux/pci-acpi.h +++ b/trunk/include/linux/pci-acpi.h @@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus) return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), pbus->number); } -#else -static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) -{ return NULL; } #endif #ifdef CONFIG_ACPI_APEI