Commit a56cdcb6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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
parents 881c4776 8e1568f3 063f8913 f5deb796 2c344e9d bd282422 d88316c2 39ba5d43

arch/ia64/kernel/acpi.c

+4 −0
Original line number Diff line number Diff line
@@ -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

   -------------------------------------------------------------------------- */