lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ull' into test

Browse Source 
Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2008-10-22 23:33:29 -04:00
parent 0ca9413c23 27663c5855
commit 7674416db4
30 changed files with 123 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/processor_perflib.c
View File

@ -127,7 +127,7 @@ static struct notifier_block acpi_ppc_notifier_block = {
static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
{
acpi_status status = 0;
unsigned long ppc = 0;
unsigned long long ppc = 0;
if (!pr)