Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3f8f7fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.9-2' of... 

Merge tag 'platform-drivers-x86-v4.9-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Fix a Kconfig issue leading potential link failure, and add a DMI
  match for an existing quirk.

  asus-wmi:
   - add SERIO_I8042 dependency

  ideapad-laptop:
   - Add Lenovo Yoga 910-13IKB to no_hw_rfkill dmi list"

* tag 'platform-drivers-x86-v4.9-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  platform/x86: asus-wmi: add SERIO_I8042 dependency
  platform/x86: ideapad-laptop: Add Lenovo Yoga 910-13IKB to no_hw_rfkill dmi list
parents 147fdd8c ea893695

drivers/platform/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ config ASUS_WMI 
config ASUS_NB_WMI

	tristate "Asus Notebook WMI Driver"

	depends on ASUS_WMI

	depends on SERIO_I8042 || SERIO_I8042 = n

	---help---

	  This is a driver for newer Asus notebooks. It adds extra features

	  like wireless radio and bluetooth control, leds, hotkeys, backlight...

drivers/platform/x86/ideapad-laptop.c

+7 −0
Original line number Diff line number Diff line
@@ -933,6 +933,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { 
			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 900"),

		},

	},

	{

		.ident = "Lenovo YOGA 910-13IKB",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 910-13IKB"),

		},

	},

	{}

};