diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-24 16:36:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-24 16:36:10 -0600 |
| commit | 18d63c35a265465b7137c4ea9c6b135aada13c3c (patch) | |
| tree | 1bff6e43ec609a86596d4704f3d50cf0adcfff74 /include/linux/acpi.h | |
| parent | 168ae6a08aa6e0cf8b0166dedeb675a20af1fbb7 (diff) | |
| parent | cd4faf9c34b27cbb6bcc70a4f1d1759f2e6fa7fd (diff) | |
| download | linux-stable-18d63c35a265465b7137c4ea9c6b135aada13c3c.tar.gz linux-stable-18d63c35a265465b7137c4ea9c6b135aada13c3c.tar.bz2 linux-stable-18d63c35a265465b7137c4ea9c6b135aada13c3c.zip | |
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4f2a76224509..90be98981102 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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); |