diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 17:36:52 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 17:36:52 +0200 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /include/acpi/processor.h | |
| parent | nls: add a nls_nullsize inline (diff) | |
| parent | Linux 2.6.30-rc4 (diff) | |
| download | linux-912bc6ae3de99c7bada4577d4341ace4ee59b5be.tar.xz linux-912bc6ae3de99c7bada4577d4341ace4ee59b5be.zip | |
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 { struct acpi_processor_cx *state; unsigned long bm_check_timestamp; u32 default_state; - u32 bm_activity; int count; struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; int timer_broadcast_on_state; |