Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / ia64 / kernel / acpi.c

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index d20a3cc8b424d0057ecd52f261687aef15b77431..90680255032eac795f3fcdcd8706d68ad33657f7 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);
 }