3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index bb6caab24322..44e411e78ed4 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -48,7 +48,7 @@ int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
 extern int __init acpi_table_parse_madt_family(char *id,
                                                unsigned long madt_size,
                                                int entry_id,
-                                               acpi_madt_entry_handler handler,
+                                               acpi_table_entry_handler handler,
                                                unsigned int max_entries);
 
 int __cpuinit pxm_to_node(int pxm)
@@ -208,7 +208,7 @@ static int __init acpi_parse_srat(struct acpi_table_header *table)
 
 int __init
 acpi_table_parse_srat(enum acpi_srat_type id,
-                      acpi_madt_entry_handler handler, unsigned int max_entries)
+                      acpi_table_entry_handler handler, unsigned int max_entries)
 {
         return acpi_table_parse_madt_family(ACPI_SIG_SRAT,
                                             sizeof(struct acpi_table_srat), id,
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 2075ec7b827b..f211fa35374c 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -173,7 +173,7 @@ int __init
 acpi_table_parse_madt_family(char *id,
                              unsigned long madt_size,
                              int entry_id,
-                             acpi_madt_entry_handler handler,
+                             acpi_table_entry_handler handler,
                              unsigned int max_entries)
 {
         struct acpi_table_header *madt = NULL;
@@ -219,7 +219,7 @@ acpi_table_parse_madt_family(char *id,
 
 int __init
 acpi_table_parse_madt(enum acpi_madt_type id,
-                      acpi_madt_entry_handler handler, unsigned int max_entries)
+                      acpi_table_entry_handler handler, unsigned int max_entries)
 {
         return acpi_table_parse_madt_family(ACPI_SIG_MADT,
                                             sizeof(struct acpi_table_madt), id,
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 815f1fb4ce21..15a23b6be449 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -75,7 +75,7 @@ enum acpi_address_range_id {
 
 typedef int (*acpi_table_handler) (struct acpi_table_header *table);
 
-typedef int (*acpi_madt_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
+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);
 unsigned long acpi_find_rsdp (void);
@@ -85,8 +85,8 @@ int acpi_numa_init (void);
 
 int acpi_table_init (void);
 int acpi_table_parse (char *id, acpi_table_handler handler);
-int acpi_table_parse_madt (enum acpi_madt_type id, acpi_madt_entry_handler handler, unsigned int max_entries);
-int acpi_table_parse_srat (enum acpi_srat_type id, acpi_madt_entry_handler handler, unsigned int max_entries);
+int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
+int acpi_table_parse_srat (enum acpi_srat_type id, acpi_table_entry_handler handler, unsigned int max_entries);
 int acpi_parse_mcfg (struct acpi_table_header *header);
 void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
 void acpi_table_print_srat_entry (struct acpi_subtable_header *srat);