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/ia64 | |
| parent | 553698f944ed715dfe023b4cef07601f0ce735f0 (diff) | |
| parent | 4c90ece249992c7a2e3fc921e5cdb8eb92193067 (diff) | |
Pull acpica into release branch
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 2 |
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) | |||
| 1999 | if (!iovp_shift) | 1999 | if (!iovp_shift) |
| 2000 | iovp_shift = min(PAGE_SHIFT, 16); | 2000 | iovp_shift = min(PAGE_SHIFT, 16); |
| 2001 | } | 2001 | } |
| 2002 | ACPI_MEM_FREE(dev_info); | 2002 | kfree(dev_info); |
| 2003 | 2003 | ||
| 2004 | /* | 2004 | /* |
| 2005 | * default anything not caught above or specified on cmdline to 4k | 2005 | * default anything not caught above or specified on cmdline to 4k |