From 0933d7435b0da8080a2863e8387aad92e42a664c Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sun, 15 Feb 2009 14:06:13 -0800 Subject: [PATCH] --- yaml --- r: 136342 b: refs/heads/master c: 970ec1a8213cd1a1ea29972ebbe4575a8b30bca1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/acpi.c | 2 +- trunk/include/linux/acpi.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ecd0f7b0cc90..8efee38480e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e1568f3500287d0b36c9776132cb53a42d5651d +refs/heads/master: 970ec1a8213cd1a1ea29972ebbe4575a8b30bca1 diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c index 2363ed173198..bdef2ce38c8b 100644 --- a/trunk/arch/ia64/kernel/acpi.c +++ b/trunk/arch/ia64/kernel/acpi.c @@ -199,7 +199,7 @@ 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) +void __init __acpi_unmap_table(char *map, unsigned long size) { } diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h index d59f0fa4d772..78199151c00b 100644 --- a/trunk/include/linux/acpi.h +++ b/trunk/include/linux/acpi.h @@ -79,7 +79,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table); typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); char * __acpi_map_table (unsigned long phys_addr, unsigned long size); -void __init __acpi_unmap_table(char *map, unsigned long size); +void __acpi_unmap_table(char *map, unsigned long size); int early_acpi_boot_init(void); int acpi_boot_init (void); int acpi_boot_table_init (void);