Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump…

…', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/header-fixes', 'x86/headers' and 'x86/minor-fixes' into x86/core
mariux64 · Feb 13, 2009 · a56cdcb · a56cdcb
8 parents 881c477 + 8e1568f + 063f891 + f5deb79 + 2c344e9 + bd28242 + d88316c + 39ba5d4
commit a56cdcb
Show file tree

Hide file tree

Showing 38 changed files with 1,283 additions and 788 deletions.
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
@@ -199,6 +199,10 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
 	return __va(phys_addr);
 }
 
+char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)
+{
+}
+
 /* --------------------------------------------------------------------------
                             Boot-time Table Parsing
    -------------------------------------------------------------------------- */