diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 17:59:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 17:59:07 -0400 |
| commit | adb2705a89e8b41abcf29c0ed86f4ce93ab36734 (patch) | |
| tree | 01d772570d58cce24b61874e711fd9f51e2729e7 /include/acpi/acpi_drivers.h | |
| parent | f340c0d1a3f40fdcba69cd291530a4debc58748f (diff) | |
| parent | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'include/acpi/acpi_drivers.h')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index c62e92ec43b2..4ec722d73381 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
| @@ -68,6 +68,7 @@ void acpi_pci_irq_del_prt (int segment, int bus); | |||
| 68 | 68 | ||
| 69 | struct pci_bus; | 69 | struct pci_bus; |
| 70 | 70 | ||
| 71 | acpi_status acpi_get_pci_id (acpi_handle handle, struct acpi_pci_id *id); | ||
| 71 | int acpi_pci_bind (struct acpi_device *device); | 72 | int acpi_pci_bind (struct acpi_device *device); |
| 72 | int acpi_pci_unbind (struct acpi_device *device); | 73 | int acpi_pci_unbind (struct acpi_device *device); |
| 73 | int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus); | 74 | int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus); |