cxgb4: avoid disabling FEC by default

[linux-2.6-block.git] / drivers / acpi / tables.c

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 2604189d6cd156e5449c7dd071d63120ea000a0e..ff425390bfa8d24b6c089a8cb427210a70740ad4 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -310,22 +310,6 @@ acpi_parse_entries_array(char *id, unsigned long table_size,
        return errs ? -EINVAL : count;
 }
 
-int __init
-acpi_parse_entries(char *id,
-                       unsigned long table_size,
-                       acpi_tbl_entry_handler handler,
-                       struct acpi_table_header *table_header,
-                       int entry_id, unsigned int max_entries)
-{
-       struct acpi_subtable_proc proc = {
-               .id             = entry_id,
-               .handler        = handler,
-       };
-
-       return acpi_parse_entries_array(id, table_size, table_header,
-                       &proc, 1, max_entries);
-}
-
 int __init
 acpi_table_parse_entries_array(char *id,
                         unsigned long table_size,
@@ -556,7 +540,7 @@ void __init acpi_table_upgrade(void)
         * But it's not enough on X86 because ioremap will
         * complain later (used by acpi_os_map_memory) that the pages
         * that should get mapped are not marked "reserved".
-        * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area)
+        * Both memblock_reserve and e820__range_add (via arch_reserve_mem_area)
         * works fine.
         */
        memblock_reserve(acpi_tables_addr, all_tables_size);