diff options
| author |   Yinghai Lu <yinghai@kernel.org> | 2009-02-15 14:06:13 -0800 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-02-16 00:43:24 +0100 |
| commit | 970ec1a8213cd1a1ea29972ebbe4575a8b30bca1 (patch) | |
| tree | f9739eb0bf8fcaa8dbd2fd1cb030f54b07f7ce71 /arch/ia64/kernel/acpi.c | |
| parent | pci, x86, acpi: fix early_ioremap() leak (diff) | |
| download | linux-dev-970ec1a8213cd1a1ea29972ebbe4575a8b30bca1.tar.xz linux-dev-970ec1a8213cd1a1ea29972ebbe4575a8b30bca1.zip | |
[IA64] fix __apci_unmap_table
Impact: fix build error
to fix:
tip/arch/ia64/kernel/acpi.c:203: error: conflicting types for '__acpi_unmap_table'
tip/include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
tip/arch/ia64/kernel/acpi.c:203: error: conflicting types for '__acpi_unmap_table'
tip/include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 2 |
1 files changed, 1 insertions, 1 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) 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) { } |