diff options
author | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:49:25 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:49:25 -0400 |
commit | 236ee8c33277ab48671995f26dc68a4639936418 (patch) | |
tree | d32c005a5a20bbfdd72be17308e80a746cdce52e /arch/ia64 | |
parent | 8cf60e04a131310199d5776e2f9e915f0c468899 (diff) |
[IA64] fix ia64 build (fadt_descriptor)
arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h
got a cleanup.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 6ea642beaaee..ca16d9556bde 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -618,7 +618,7 @@ EXPORT_SYMBOL(acpi_unregister_gsi); | |||
618 | static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) | 618 | static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) |
619 | { | 619 | { |
620 | struct acpi_table_header *fadt_header; | 620 | struct acpi_table_header *fadt_header; |
621 | struct fadt_descriptor_rev2 *fadt; | 621 | struct fadt_descriptor *fadt; |
622 | 622 | ||
623 | if (!phys_addr || !size) | 623 | if (!phys_addr || !size) |
624 | return -EINVAL; | 624 | return -EINVAL; |
@@ -627,7 +627,7 @@ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) | |||
627 | if (fadt_header->revision != 3) | 627 | if (fadt_header->revision != 3) |
628 | return -ENODEV; /* Only deal with ACPI 2.0 FADT */ | 628 | return -ENODEV; /* Only deal with ACPI 2.0 FADT */ |
629 | 629 | ||
630 | fadt = (struct fadt_descriptor_rev2 *)fadt_header; | 630 | fadt = (struct fadt_descriptor *)fadt_header; |
631 | 631 | ||
632 | if (!(fadt->iapc_boot_arch & BAF_8042_KEYBOARD_CONTROLLER)) | 632 | if (!(fadt->iapc_boot_arch & BAF_8042_KEYBOARD_CONTROLLER)) |
633 | acpi_kbd_controller_present = 0; | 633 | acpi_kbd_controller_present = 0; |