summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-30 00:24:40 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-30 00:24:40 +0200
commitfeb41bb1ca6b969985cd5e486a3f2deac9f089fa (patch)
treeaeb6c21669858b06c1086cb3fe4d5d8124329835 /drivers/acpi
parentb6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff)
parente70dba6020eaaceb1d3619dfb535c719900c7091 (diff)
downloadop-kernel-dev-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.zip
op-kernel-dev-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.tar.gz
Merge back earlier acpi-pnp material.
Conflicts: drivers/pnp/pnpacpi/core.c
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/internal.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 7de5b60..151f3e7 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);
OpenPOWER on IntegriCloud