aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-24 01:35:08 -0400
committerLen Brown <len.brown@intel.com>2009-04-24 01:35:08 -0400
commitf752a091abd1f9d38f926823bfd5c8480dd1132b (patch)
treeace3b9ae356ac88c583678ad3e40cc2b6a7fb5a0 /include
parent6e6c348fb23122c6faf89ef10f1b9f034dba0da5 (diff)
parent92614610774072ea68131f16e024ee8fc15be9be (diff)
Merge branch 'idle' into release
Diffstat (limited to 'include')
-rw-r--r--include/acpi/processor.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index b09c4fde9725..4927c063347c 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -84,7 +84,6 @@ struct acpi_processor_power {
84 struct acpi_processor_cx *state; 84 struct acpi_processor_cx *state;
85 unsigned long bm_check_timestamp; 85 unsigned long bm_check_timestamp;
86 u32 default_state; 86 u32 default_state;
87 u32 bm_activity;
88 int count; 87 int count;
89 struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; 88 struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER];
90 int timer_broadcast_on_state; 89 int timer_broadcast_on_state;