summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 15:19:48 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 15:19:48 -0400
commitb3899c6613160b18f79e4356184de55311302fe4 (patch)
tree4aa7945bac59cbe5bb5d863be2d4ded285d3e936 /arch/ia64
parent553698f944ed715dfe023b4cef07601f0ce735f0 (diff)
parent4c90ece249992c7a2e3fc921e5cdb8eb92193067 (diff)
downloadlinux-b3899c6613160b18f79e4356184de55311302fe4.tar.gz
linux-b3899c6613160b18f79e4356184de55311302fe4.tar.bz2
linux-b3899c6613160b18f79e4356184de55311302fe4.zip
Pull acpica into release branch
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/hp/common/sba_iommu.c2
1 files changed, 1 insertions, 1 deletions
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