From 9a930308d7366cd50b6160f95ec56410b383b3aa Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Fri, 23 Jun 2006 13:49:25 -0700 Subject: [PATCH] --- yaml --- r: 29207 b: refs/heads/master c: 236ee8c33277ab48671995f26dc68a4639936418 h: refs/heads/master i: 29205: 2116a8ee6eecf1cddb37d7fc635519d64a1bf8ac 29203: 70deaae11c047d3e281ac740dfcf65c1ca833b48 29199: b6d3b3aab0c2f27c2e8b946071144a4595f2bbe7 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/acpi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2e4ed347c409..cff4b4c4d19f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cf60e04a131310199d5776e2f9e915f0c468899 +refs/heads/master: 236ee8c33277ab48671995f26dc68a4639936418 diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c index 6ea642beaaee..ca16d9556bde 100644 --- a/trunk/arch/ia64/kernel/acpi.c +++ b/trunk/arch/ia64/kernel/acpi.c @@ -618,7 +618,7 @@ EXPORT_SYMBOL(acpi_unregister_gsi); static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) { struct acpi_table_header *fadt_header; - struct fadt_descriptor_rev2 *fadt; + struct fadt_descriptor *fadt; if (!phys_addr || !size) return -EINVAL; @@ -627,7 +627,7 @@ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) if (fadt_header->revision != 3) return -ENODEV; /* Only deal with ACPI 2.0 FADT */ - fadt = (struct fadt_descriptor_rev2 *)fadt_header; + fadt = (struct fadt_descriptor *)fadt_header; if (!(fadt->iapc_boot_arch & BAF_8042_KEYBOARD_CONTROLLER)) acpi_kbd_controller_present = 0;