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 /drivers/acpi | |
| parent | b6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff) | |
| parent | e70dba6020eaaceb1d3619dfb535c719900c7091 (diff) | |
Merge back earlier acpi-pnp material.
Conflicts:
drivers/pnp/pnpacpi/core.c
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 7de5b603f272..151f3e76d47a 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h | |||
| @@ -84,8 +84,6 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, | |||
| 84 | int type, unsigned long long sta); | 84 | int type, unsigned long long sta); |
| 85 | void acpi_device_add_finalize(struct acpi_device *device); | 85 | void acpi_device_add_finalize(struct acpi_device *device); |
| 86 | void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); | 86 | void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); |
| 87 | int acpi_bind_one(struct device *dev, struct acpi_device *adev); | ||
| 88 | int acpi_unbind_one(struct device *dev); | ||
| 89 | bool acpi_device_is_present(struct acpi_device *adev); | 87 | bool acpi_device_is_present(struct acpi_device *adev); |
| 90 | bool acpi_device_is_battery(struct acpi_device *adev); | 88 | bool acpi_device_is_battery(struct acpi_device *adev); |
| 91 | 89 | ||