diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-06-23 22:49:25 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 22:49:25 +0200 |
| commit | 236ee8c33277ab48671995f26dc68a4639936418 (patch) | |
| tree | d32c005a5a20bbfdd72be17308e80a746cdce52e | |
| parent | Auto-update from upstream (diff) | |
| download | linux-236ee8c33277ab48671995f26dc68a4639936418.tar.xz linux-236ee8c33277ab48671995f26dc68a4639936418.zip | |
[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>
| -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); 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; |