summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-10-25 10:25:59 -0400
committerLen Brown <len.brown@intel.com>2004-10-25 10:25:59 -0400
commita75acf42f01fee4f76245e48f10f9a4da2dd6acb (patch)
tree4d37bcc10d0e814c1a952f0b63cd27371e4673a3 /include
parent94e654e136a20c3fc00f31d2629d51b73aa1d8b3 (diff)
parentecdac443fe05a301775d7eb13b4021463e409223 (diff)
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 86513a0fd468..d2c280e0fabc 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -104,6 +104,7 @@ typedef int (*acpi_op_suspend) (struct acpi_device *device, int state);
typedef int (*acpi_op_resume) (struct acpi_device *device, int state);
typedef int (*acpi_op_scan) (struct acpi_device *device);
typedef int (*acpi_op_bind) (struct acpi_device *device);
+typedef int (*acpi_op_match) (struct acpi_device *device, struct acpi_driver *driver);
struct acpi_device_ops {
acpi_op_add add;
@@ -115,6 +116,7 @@ struct acpi_device_ops {
acpi_op_resume resume;
acpi_op_scan scan;
acpi_op_bind bind;
+ acpi_op_match match;
};
struct acpi_driver {