diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /include/acpi/processor.h | |
| parent | d37dc42ab6f040b8f0f2962ab219c5b2accf748d (diff) | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 1 |
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; |