diff options
| author | Rafael J. Wysocki | 2014-07-30 00:24:40 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2014-07-30 00:24:40 +0200 |
| commit | feb41bb1ca6b969985cd5e486a3f2deac9f089fa (patch) | |
| tree | aeb6c21669858b06c1086cb3fe4d5d8124329835 /drivers/acpi | |
| parent | ACPI / PNP: Fix acpi_pnp_match() (diff) | |
| parent | ACPI / PNP: Use ACPI_COMPANION() instead of ACPI_HANDLE() (diff) | |
| download | kernel-qcow2-linux-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.tar.gz kernel-qcow2-linux-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.tar.xz kernel-qcow2-linux-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.zip | |
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, int type, unsigned long long sta); void acpi_device_add_finalize(struct acpi_device *device); void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); -int acpi_bind_one(struct device *dev, struct acpi_device *adev); -int acpi_unbind_one(struct device *dev); bool acpi_device_is_present(struct acpi_device *adev); bool acpi_device_is_battery(struct acpi_device *adev); |