diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 11:33:51 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 11:33:51 +1000 |
commit | 76bf4f2d9463741745c5c8453113a3c3e0527664 (patch) | |
tree | e1a68dddf68d21b84e3d1f72636cb79e9d6af19b /include | |
parent | b48cf2f0a2c7c2f347c2b42036eae9420dc5104f (diff) | |
parent | d92cc3866dfe4e5de25303c99fc2b2c4d051df5e (diff) |
Merge commit 'acpi/test'
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c65e4ce6c3af..79a6c5ebe908 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -89,7 +89,6 @@ struct acpi_device; typedef int (*acpi_op_add) (struct acpi_device * device); typedef int (*acpi_op_remove) (struct acpi_device * device, int type); typedef int (*acpi_op_start) (struct acpi_device * device); -typedef int (*acpi_op_stop) (struct acpi_device * device, int type); typedef int (*acpi_op_suspend) (struct acpi_device * device, pm_message_t state); typedef int (*acpi_op_resume) (struct acpi_device * device); @@ -106,7 +105,6 @@ struct acpi_device_ops { acpi_op_add add; acpi_op_remove remove; acpi_op_start start; - acpi_op_stop stop; acpi_op_suspend suspend; acpi_op_resume resume; acpi_op_bind bind; |