aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/acpi.c2
-rw-r--r--include/linux/acpi.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 2363ed173198..bdef2ce38c8b 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -199,7 +199,7 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
199 return __va(phys_addr); 199 return __va(phys_addr);
200} 200}
201 201
202char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size) 202void __init __acpi_unmap_table(char *map, unsigned long size)
203{ 203{
204} 204}
205 205
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d59f0fa4d772..78199151c00b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -79,7 +79,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table);
79typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); 79typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
80 80
81char * __acpi_map_table (unsigned long phys_addr, unsigned long size); 81char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
82void __init __acpi_unmap_table(char *map, unsigned long size); 82void __acpi_unmap_table(char *map, unsigned long size);
83int early_acpi_boot_init(void); 83int early_acpi_boot_init(void);
84int acpi_boot_init (void); 84int acpi_boot_init (void);
85int acpi_boot_table_init (void); 85int acpi_boot_table_init (void);