Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4cd86e87769d..a1b7189c2514 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -351,10 +351,10 @@ typedef int (*acpi_madt_entry_handler) (acpi_table_entry_header *header);
 
 char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
 unsigned long acpi_find_rsdp (void);
-int acpi_boot_init (char *cmdline);
+int acpi_boot_init (void);
 int acpi_numa_init (void);
 
-int acpi_table_init (char *cmdline);
+int acpi_table_init (void);
 int acpi_table_parse (enum acpi_table_id id, acpi_table_handler handler);
 int acpi_get_table_header_early (enum acpi_table_id id, struct acpi_table_header **header);
 int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler);