Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / acpi / blacklist.c

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 7556e7c..9b693d5 100644 (file)
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -304,60 +304,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"),
-               },
-       },
        /*
         * Without this this EEEpc exports a non working WMI interface, with
         * this it exports a working "good old" eeepc_laptop interface, fixing