Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next

This commit is contained in:
Bjorn Helgaas 2012-09-24 16:36:10 -06:00
commit 18d63c35a2
5 changed files with 89 additions and 91 deletions

View file

@ -138,9 +138,9 @@ void acpi_penalize_isa_irq(int irq, int active);
void acpi_pci_irq_disable (struct pci_dev *dev);
struct acpi_pci_driver {
struct acpi_pci_driver *next;
int (*add)(acpi_handle handle);
void (*remove)(acpi_handle handle);
struct list_head node;
int (*add)(struct acpi_pci_root *root);
void (*remove)(struct acpi_pci_root *root);
};
int acpi_pci_register_driver(struct acpi_pci_driver *driver);