diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:19:48 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:19:48 -0400 |
| commit | b3899c6613160b18f79e4356184de55311302fe4 (patch) | |
| tree | 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 /arch/i386 | |
| parent | 553698f944ed715dfe023b4cef07601f0ce735f0 (diff) | |
| parent | 4c90ece249992c7a2e3fc921e5cdb8eb92193067 (diff) | |
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; | |||
| 621 | 621 | ||
| 622 | static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) | 622 | static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) |
| 623 | { | 623 | { |
| 624 | struct fadt_descriptor_rev2 *fadt = NULL; | 624 | struct fadt_descriptor *fadt = NULL; |
| 625 | 625 | ||
| 626 | fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size); | 626 | fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size); |
| 627 | if (!fadt) { | 627 | if (!fadt) { |
| 628 | printk(KERN_WARNING PREFIX "Unable to map FADT\n"); | 628 | printk(KERN_WARNING PREFIX "Unable to map FADT\n"); |
| 629 | return 0; | 629 | return 0; |