

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/include/linux/acpi.h |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN include/linux/acpi.h~x86_64-split-acpi-boot-table-parsing-fix include/linux/acpi.h
--- 25/include/linux/acpi.h~x86_64-split-acpi-boot-table-parsing-fix	2004-12-01 22:48:12.886030056 -0800
+++ 25-akpm/include/linux/acpi.h	2004-12-01 22:48:12.891029296 -0800
@@ -418,8 +418,7 @@ static inline int acpi_boot_init(void)
 	return 0;
 }
 
-
-static inline int acpi_table_init(void)
+static inline int acpi_boot_table_init(void)
 {
 	return 0;
 }
_
