summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-30 22:49:37 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-30 22:49:37 +0400
commita5bd1786fb30abe663b904f6d79bba413e9ba883 (patch)
treed184021d1e81faed3a61be3a780f3c06c50b70d7 /drivers
parent964429252a88cbb4eccd9f024a00813e10d16c71 (diff)
parent4e381a4f06e3c7b350b55a2636b9d45691780eba (diff)
downloadlinux-a5bd1786fb30abe663b904f6d79bba413e9ba883.tar.xz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: Revert "ACPI: parse 2nd MADT by default"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/tables.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 96792a6cc164..c3419182c9a7 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -42,7 +42,7 @@ static char *mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" };
static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;
-static int acpi_apic_instance __initdata = 2;
+static int acpi_apic_instance __initdata;
void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
{