Merge branch 'wakeup-etc-rafael' into release

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;