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

Merge branch 'wakeup-etc-rafael' into release

Browse Source
This commit is contained in:
Len Brown
2011-01-12 04:55:46 -05:00
parent 07bf280521 7b330707dd
commit fb4af417cc
8 changed files with 96 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/acpi/acpi_bus.h
View File

@@ -241,20 +241,14 @@ struct acpi_device_perf {
struct acpi_device_wakeup_flags {
u8 valid:1; /* Can successfully enable wakeup? */
u8 run_wake:1; /* Run-Wake GPE devices */
u8 always_enabled:1; /* Run-wake devices that are always enabled */
u8 notifier_present:1; /* Wake-up notify handler has been installed */
};
struct acpi_device_wakeup_state {
u8 enabled:1;
};
struct acpi_device_wakeup {
acpi_handle gpe_device;
u64 gpe_number;
u64 sleep_state;
struct acpi_handle_list resources;
struct acpi_device_wakeup_state state;
struct acpi_device_wakeup_flags flags;
int prepare_count;
int run_wake_count;