diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-29 18:24:40 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-29 18:24:40 -0400 |
| commit | feb41bb1ca6b969985cd5e486a3f2deac9f089fa (patch) | |
| tree | aeb6c21669858b06c1086cb3fe4d5d8124329835 /include | |
| parent | b6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff) | |
| parent | e70dba6020eaaceb1d3619dfb535c719900c7091 (diff) | |
Merge back earlier acpi-pnp material.
Conflicts:
drivers/pnp/pnpacpi/core.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index b5714580801a..4bcbb941bc09 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -487,6 +487,8 @@ struct acpi_bus_type { | |||
| 487 | }; | 487 | }; |
| 488 | int register_acpi_bus_type(struct acpi_bus_type *); | 488 | int register_acpi_bus_type(struct acpi_bus_type *); |
| 489 | int unregister_acpi_bus_type(struct acpi_bus_type *); | 489 | int unregister_acpi_bus_type(struct acpi_bus_type *); |
| 490 | int acpi_bind_one(struct device *dev, struct acpi_device *adev); | ||
| 491 | int acpi_unbind_one(struct device *dev); | ||
| 490 | 492 | ||
| 491 | struct acpi_pci_root { | 493 | struct acpi_pci_root { |
| 492 | struct acpi_device * device; | 494 | struct acpi_device * device; |