summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-01-27 14:19:58 -0500
committerLen Brown <len.brown@intel.com>2004-01-27 14:19:58 -0500
commit0b18c35a58b3a84912d3ac57c723d017e343872d (patch)
treeb4c03ea20a24f6813d8a90809d09fe1f9c20a0ba /include/linux
parent573d821f52beb79c8db084917bb21b365f6d583d (diff)
parenta2e1b35b1ccdd67e9f1b7a0c83d39968059286ca (diff)
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0
into intel.com:/home/lenb/src/linux-acpi-test-2.6.1
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/acpi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 8e4eba21e7ea..f851b34903e3 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -355,8 +355,8 @@ int acpi_numa_init (void);
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);
-int acpi_table_parse_srat (enum acpi_srat_entry_id id, acpi_madt_entry_handler handler);
+int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler, unsigned int max_entries);
+int acpi_table_parse_srat (enum acpi_srat_entry_id id, acpi_madt_entry_handler handler, unsigned int max_entries);
void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);
void acpi_table_print_madt_entry (acpi_table_entry_header *madt);
void acpi_table_print_srat_entry (acpi_table_entry_header *srat);