summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-09-24 16:36:10 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-09-24 16:36:10 -0600
commit18d63c35a265465b7137c4ea9c6b135aada13c3c (patch)
tree1bff6e43ec609a86596d4704f3d50cf0adcfff74 /include/linux/acpi.h
parent168ae6a08aa6e0cf8b0166dedeb675a20af1fbb7 (diff)
parentcd4faf9c34b27cbb6bcc70a4f1d1759f2e6fa7fd (diff)
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4f2a7622450..90be9898110 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);