projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'misc' and 'misc-2.6.25' into release
[powerpc.git]
/
arch
/
ia64
/
kernel
/
acpi.c
diff --git
a/arch/ia64/kernel/acpi.c
b/arch/ia64/kernel/acpi.c
index
d20a3cc
..
9068025
100644
(file)
--- a/
arch/ia64/kernel/acpi.c
+++ b/
arch/ia64/kernel/acpi.c
@@
-166,7
+166,7
@@
int acpi_request_vector(u32 int_type)
return vector;
}
-char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
+char *__
init __
acpi_map_table(unsigned long phys_addr, unsigned long size)
{
return __va(phys_addr);
}