Merge tag 'platform-drivers-x86-v3.19-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver update from Darren Hart:
 - thinkpad-acpi: Switch to software mute, cleanups
 - acerhdf: Bang-bang thermal governor, new models, cleanups
 - dell-laptop: New keyboard backlight support and documentation
 - toshiba_acpi: Keyboard backlight updates, hotkey handling
 - dell-wmi: Keypress filtering, WMI event processing
 - eeepc-laptop: Multiple cleanups, improved error handling, documentation
 - hp_wireless: Inform the user if hp_wireless_input_setup()/add() fails
 - misc: Code cleanups, quirks, various new IDs

* tag 'platform-drivers-x86-v3.19-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (33 commits)
  platform/x86/acerhdf: Still depends on THERMAL
  Documentation: Add entry for dell-laptop sysfs interface
  acpi: Remove _OSI(Linux) for ThinkPads
  thinkpad-acpi: Try to use full software mute control
  acerhdf: minor clean up
  acerhdf: added critical trip point
  acerhdf: Use bang-bang thermal governor
  acerhdf: Adding support for new models
  acerhdf: Adding support for "manual mode"
  dell-smo8800: Add more ACPI ids and change description of driver
  platform: x86: dell-laptop: Add support for keyboard backlight
  toshiba_acpi: Add keyboard backlight mode change event
  toshiba_acpi: Change notify funtion to handle more events
  toshiba_acpi: Move hotkey enabling code to its own function
  dell-wmi: Don't report keypresses on keybord illumination change
  dell-wmi: Don't report keypresses for radio state changes
  hp_wireless: Inform the user if hp_wireless_input_setup()/add() fails
  toshiba-acpi: Add missing ID (TOS6207)
  Sony-laptop: Deletion of an unnecessary check before the function call "pci_dev_put"
  platform: x86: Deletion of checks before backlight_device_unregister()
  ...

1 files changed, 0 insertions, 54 deletions

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 7556e7c4a055..9b693d54c743 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -305,60 +305,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
          */
 
         /*
-         * 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
          * both brightness control, and rfkill not working.