diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 01:56:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:56:39 -0400 |
| commit | 3b87bb640e77023c97cf209e3dd85887a1113ad0 (patch) | |
| tree | c4531d2c954bcc28706837cc67a8865677e51fbf /include/acpi | |
| parent | 7a92d803227a523a9a5546e4e0dce1325a4b5926 (diff) | |
| parent | dcf52fb71d988ba945054308f661bddf9b2455fb (diff) | |
| download | op-kernel-dev-3b87bb640e77023c97cf209e3dd85887a1113ad0.zip op-kernel-dev-3b87bb640e77023c97cf209e3dd85887a1113ad0.tar.gz | |
Merge branch 'bjorn-start-stop-2.6.32' into release
Diffstat (limited to 'include/acpi')
| -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 af5905e..89bbb2a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -87,7 +87,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); @@ -104,7 +103,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; |
