From 4557902b21fd41b12ebeed1727ffb30fbf8c0a3c Mon Sep 17 00:00:00 2001 From: Len Brown Date: Wed, 23 Jan 2008 20:56:18 -0500 Subject: [PATCH] --- yaml --- r: 75678 b: refs/heads/master c: 98f1db22d70b0660a27cc8818a61181b5d503671 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/blacklist.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2b11fa7818f7..24c9d9d143d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4b7dc499daae909e62dc260b95cd618f2970ded +refs/heads/master: 98f1db22d70b0660a27cc8818a61181b5d503671 diff --git a/trunk/drivers/acpi/blacklist.c b/trunk/drivers/acpi/blacklist.c index 018fc16c44ce..e88d4460afda 100644 --- a/trunk/drivers/acpi/blacklist.c +++ b/trunk/drivers/acpi/blacklist.c @@ -173,7 +173,34 @@ int __init acpi_blacklisted(void) return blacklisted; } #ifdef CONFIG_DMI +static int __init dmi_enable_osi_linux(const struct dmi_system_id *d) +{ + acpi_dmi_osi_linux(1, d); /* enable */ + return 0; +} + static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { + /* + * _OSI(Linux) helps sound + * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"), + * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"), + */ + { + .callback = dmi_enable_osi_linux, + .ident = "Lenovo ThinkPad R61", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"), + }, + }, + { + .callback = dmi_enable_osi_linux, + .ident = "Lenovo ThinkPad T61", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"), + }, + }, {} };