diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:36:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:36:22 -0800 |
commit | bc535154137601400ffe44c2a7be047ca041fe06 (patch) | |
tree | 1b6ad05ec2a458d44a384aa90b2ef914c6ce4d52 /drivers/acpi/processor_idle.c | |
parent | d03ab7ff335b7fbf48d0fd28ead5d7957798510b (diff) | |
parent | 439913fffd39374c3737186b22d2d56c3a0ae526 (diff) | |
download | blackbird-obmc-linux-bc535154137601400ffe44c2a7be047ca041fe06.tar.gz blackbird-obmc-linux-bc535154137601400ffe44c2a7be047ca041fe06.zip |
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: replace acpi_integer by u64
ACPICA: Update version to 20100121.
ACPICA: Remove unused uint32_struct type
ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
ACPICA: Predefined name repair: fix NULL package elements
ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
ACPICA: Update all ACPICA copyrights and signons to 2010
ACPICA: Update for new gcc-4 warning options
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-rw-r--r-- | drivers/acpi/processor_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index cc978a8c00b7..37dfce749398 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -360,7 +360,7 @@ static int acpi_processor_get_power_info_default(struct acpi_processor *pr) static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) { acpi_status status = 0; - acpi_integer count; + u64 count; int current_count; int i; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |