Skip to content

Commit

Permalink
[IA64] fix ia64 build (fadt_descriptor)
Browse files Browse the repository at this point in the history
arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h
got a cleanup.

Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Tony Luck committed Jun 23, 2006
1 parent 8cf60e0 commit 236ee8c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/ia64/kernel/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 236ee8c

Please sign in to comment.