git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ia64
/
hp
/
common
/
sba_iommu.c
diff --git
a/arch/ia64/hp/common/sba_iommu.c
b/arch/ia64/hp/common/sba_iommu.c
index
bdccd0b
..
db8e1fc
100644
(file)
--- a/
arch/ia64/hp/common/sba_iommu.c
+++ b/
arch/ia64/hp/common/sba_iommu.c
@@
-19,7
+19,6
@@
**
*/
**
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-1958,7
+1957,7
@@
sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
if (pxm < 0)
return;
if (pxm < 0)
return;
- node = pxm_to_n
id_map[pxm]
;
+ node = pxm_to_n
ode(pxm)
;
if (node >= MAX_NUMNODES || !node_online(node))
return;
if (node >= MAX_NUMNODES || !node_online(node))
return;
@@
-1999,7
+1998,7
@@
acpi_sba_ioc_add(struct acpi_device *device)
if (!iovp_shift)
iovp_shift = min(PAGE_SHIFT, 16);
}
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
/*
* default anything not caught above or specified on cmdline to 4k