Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[karo-tx-linux.git] / include / acpi / processor.h

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index cbb6cd3a98d750851d97255cbe8f3ca7f36ae032..3ca9b751f1224cfd9a6816ebebe38d7559c7bcd0 100644 (file)
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -67,9 +67,6 @@ struct acpi_processor_cx {
 };
 
 struct acpi_processor_power {
-       struct acpi_processor_cx *state;
-       unsigned long bm_check_timestamp;
-       u32 default_state;
        int count;
        struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER];
        int timer_broadcast_on_state;