Now that thinkpad-acpi knows how to program the hardware mute button
on recent ThinkPads, the _OSI(Linux) hack is unnecessary.

Signed-off-by: Andy Lutomirski <l...@mit.edu>
---

I don't have all of these machines to test, but at least the X220 and
X200s don't need the blacklist anymore if the thinkpad-acpi volume
control patch is applied.

(I was one of the people who argued for the X61 blacklist entry, and
the X61 almost certainly doesn't need the blacklist anymore, but I
can't test because I don't have that box any more.)

I didn't remove the blacklist infrastructure because something else
might need it some day.

 drivers/acpi/blacklist.c |   54 ----------------------------------------------
 1 files changed, 0 insertions(+), 54 deletions(-)

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index af308d0..de0943d 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -274,60 +274,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] 
__initdata = {
         * Linux ignores it, except for the machines enumerated below.
         */
 
-       /*
-        * Lenovo has a mix of systems OSI(Linux) situations
-        * and thus we can not wildcard the vendor.
-        *
-        * _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:
-        * DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
-        * DMI_MATCH(DMI_PRODUCT_VERSION, "LENOVO3000 V100"),
-        */
-       {
-       .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"),
-               },
-       },
-       {
-       .callback = dmi_enable_osi_linux,
-       .ident = "Lenovo ThinkPad X61",
-       .matches = {
-                    DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                    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"),
-               },
-       },
        {}
 };
 
-- 
1.7.5.1


------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
ibm-acpi-devel mailing list
ibm-acpi-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

Reply via email to