diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 12:04:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 12:04:38 -0700 |
| commit | b411c17eb96a1467d08d0538a7bf5166e5372234 (patch) | |
| tree | e2514ae025d7b17b13b72356976b0cc36d287637 /drivers | |
| parent | 8dc54e49ce67e5628bf4668c64203c22cbac7fc5 (diff) | |
| parent | 7cfff7f21221725f587ba90bd1acf0e2e0304901 (diff) | |
| download | linux-b411c17eb96a1467d08d0538a7bf5166e5372234.tar.gz linux-b411c17eb96a1467d08d0538a7bf5166e5372234.tar.bz2 linux-b411c17eb96a1467d08d0538a7bf5166e5372234.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:
ACPI: add DMI to disable AML Vista compatibility on MSI GX723 Notebook
ACPI: Handle ACPI0007 Device in acpi_early_set_pdc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/blacklist.c | 17 | ||||
| -rw-r--r-- | drivers/acpi/processor_core.c | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index f7619600270a..af308d03f492 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -204,6 +204,23 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { }, }, { + /* + * There have a NVIF method in MSI GX723 DSDT need call by Nvidia + * driver (e.g. nouveau) when user press brightness hotkey. + * Currently, nouveau driver didn't do the job and it causes there + * have a infinite while loop in DSDT when user press hotkey. + * We add MSI GX723's dmi information to this table for workaround + * this issue. + * Will remove MSI GX723 from the table after nouveau grows support. + */ + .callback = dmi_disable_osi_vista, + .ident = "MSI GX723", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), + DMI_MATCH(DMI_PRODUCT_NAME, "GX723"), + }, + }, + { .callback = dmi_disable_osi_vista, .ident = "Sony VGN-NS10J_S", .matches = { diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index b618f888d66b..bec561c14beb 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -346,4 +346,5 @@ void __init acpi_early_processor_set_pdc(void) acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, early_init_pdc, NULL, NULL, NULL); + acpi_get_devices("ACPI0007", early_init_pdc, NULL, NULL); } |