]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] fix ia64 build (fadt_descriptor)
authorTony Luck <tony.luck@intel.com>
Fri, 23 Jun 2006 20:49:25 +0000 (13:49 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 23 Jun 2006 20:49:25 +0000 (13:49 -0700)
arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h
got a cleanup.

Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/acpi.c

index 6ea642beaaeeb801987d73b32b205375090708da..ca16d9556bdefa0a96ed5d60992955b407b42cb9 100644 (file)
@@ -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;