summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-02-15 14:06:13 -0800
committerIngo Molnar <mingo@elte.hu>2009-02-16 00:43:24 +0100
commit970ec1a8213cd1a1ea29972ebbe4575a8b30bca1 (patch)
treef9739eb0bf8fcaa8dbd2fd1cb030f54b07f7ce71 /include/linux/acpi.h
parent8e1568f3500287d0b36c9776132cb53a42d5651d (diff)
downloadop-kernel-dev-970ec1a8213cd1a1ea29972ebbe4575a8b30bca1.zip
op-kernel-dev-970ec1a8213cd1a1ea29972ebbe4575a8b30bca1.tar.gz
[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 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d59f0fa..7819915 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);
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);
OpenPOWER on IntegriCloud