diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 21:19:48 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 21:19:48 +0200 |
| commit | b3899c6613160b18f79e4356184de55311302fe4 (patch) | |
| tree | 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 /arch/i386 | |
| parent | [PATCH] cfq-iosched: fix crash in do_div() (diff) | |
| parent | ACPI: ACPICA 20060608 (diff) | |
| download | linux-b3899c6613160b18f79e4356184de55311302fe4.tar.xz linux-b3899c6613160b18f79e4356184de55311302fe4.zip | |
Pull acpica into release branch
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 40e5aba3ad3d..7ff6f9dadc66 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -621,9 +621,9 @@ extern u32 pmtmr_ioport; static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) { - struct fadt_descriptor_rev2 *fadt = NULL; + struct fadt_descriptor *fadt = NULL; - fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size); + fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size); if (!fadt) { printk(KERN_WARNING PREFIX "Unable to map FADT\n"); return 0; |