summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-11-25 06:43:08 +0100
committerLen Brown <len.brown@intel.com>2009-11-25 06:43:08 +0100
commit644417958b0bbb1dbf79003fc14e6ccf1271b9ad (patch)
tree82fe22f2ae71cf7152afb19f3478beae13ed91a5 /drivers/acpi
parentMerge branch 'bugzilla-14379' into release (diff)
parentthinkpad-acpi: fix detection of old ThinkPads (diff)
downloadlinux-644417958b0bbb1dbf79003fc14e6ccf1271b9ad.tar.xz
linux-644417958b0bbb1dbf79003fc14e6ccf1271b9ad.zip
Merge branch 'thinkpad-2.6.32' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/blacklist.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index e56b2a7b53db..23e5a0519af5 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -224,6 +224,7 @@ 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"),
+ * T400, T500
* _OSI(Linux) has Linux specific hooks
* DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
* _OSI(Linux) is a NOP:
@@ -254,6 +255,22 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
},
},
+ {
+ .callback = dmi_enable_osi_linux,
+ .ident = "Lenovo ThinkPad T400",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T400"),
+ },
+ },
+ {
+ .callback = dmi_enable_osi_linux,
+ .ident = "Lenovo ThinkPad T500",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"),
+ },
+ },
{}
};