lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bjorn-start-stop-2.6.32' into release

Browse Source
This commit is contained in:
Len Brown
2009-09-19 01:56:39 -04:00
parent 7a92d80322 dcf52fb71d
commit 3b87bb640e
5 changed files with 196 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/acpi/acpi_bus.h
View File

@ -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;