Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull x86 platform driver fixes from Darren Hart:
"This includes a trivial warning and adding a Lenovo laptop to an
existing quirk.

I've held off on things like the latter in the past, but I didn't feel
it was risky enough to push out to 4.2.

- thinkpad_acpi:
Fix warning for static not at beginning

- ideapad_laptop:
Add Lenovo G40-30 to devices without radio switch"

* tag 'platform-drivers-x86-v4.1-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
thinkpad_acpi: Fix warning for static not at beginning
ideapad_laptop: Add Lenovo G40-30 to devices without radio switch

+8 -1
+7
drivers/platform/x86/ideapad-laptop.c
··· 830 830 */ 831 831 static const struct dmi_system_id no_hw_rfkill_list[] = { 832 832 { 833 + .ident = "Lenovo G40-30", 834 + .matches = { 835 + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), 836 + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"), 837 + }, 838 + }, 839 + { 833 840 .ident = "Lenovo Yoga 2 11 / 13 / Pro", 834 841 .matches = { 835 842 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+1 -1
drivers/platform/x86/thinkpad_acpi.c
··· 2115 2115 return 0; 2116 2116 } 2117 2117 2118 - void static hotkey_mask_warn_incomplete_mask(void) 2118 + static void hotkey_mask_warn_incomplete_mask(void) 2119 2119 { 2120 2120 /* log only what the user can fix... */ 2121 2121 const u32 wantedmask = hotkey_driver_mask &