Pull acpica into release branch

2 files changed, 3 insertions, 3 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;
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index bdccd0b1eb60..dd4a2f792632 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1999,7 +1999,7 @@ acpi_sba_ioc_add(struct acpi_device *device)
                 if (!iovp_shift)
                         iovp_shift = min(PAGE_SHIFT, 16);
         }
-        ACPI_MEM_FREE(dev_info);
+        kfree(dev_info);
 
         /*
          * default anything not caught above or specified on cmdline to 4k