diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-30 11:49:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-30 11:49:37 -0700 |
| commit | a5bd1786fb30abe663b904f6d79bba413e9ba883 (patch) | |
| tree | d184021d1e81faed3a61be3a780f3c06c50b70d7 | |
| parent | [PATCH] Maxtor 6B250S0/BANC1B70 hangs with NCQ (diff) | |
| parent | Revert "ACPI: parse 2nd MADT by default" (diff) | |
| download | linux-dev-a5bd1786fb30abe663b904f6d79bba413e9ba883.tar.xz linux-dev-a5bd1786fb30abe663b904f6d79bba413e9ba883.zip | |
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"
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
| -rw-r--r-- | drivers/acpi/tables.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ef2ffded1392..12533a958c51 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -142,7 +142,7 @@ and is between 256 and 4096 characters. It is defined in the file Format: <int> 2: use 2nd APIC table, if available 1,0: use 1st APIC table - default: 2 + default: 0 acpi_sleep= [HW,ACPI] Sleep options Format: { s3_bios, s3_mode } 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) { |