diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:55:46 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:55:46 -0500 |
| commit | fb4af417cce9ff87abf33a6bb9a0cf613e285364 (patch) | |
| tree | 328ce710c6e6acf7b58145da939fb3cc91d188c9 /include | |
| parent | 07bf280521bb06bc8e64f0b998fc391253fcb959 (diff) | |
| parent | 7b330707dddab1ad772898c1c82516342a551173 (diff) | |
| download | linux-fb4af417cce9ff87abf33a6bb9a0cf613e285364.tar.gz linux-fb4af417cce9ff87abf33a6bb9a0cf613e285364.tar.bz2 linux-fb4af417cce9ff87abf33a6bb9a0cf613e285364.zip | |
Merge branch 'wakeup-etc-rafael' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 673a3f4d1f07..20b05cd68663 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -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; |