iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform-drivers-x86 for 4.1-2

Browse Source 
thinkpad_acpi: Fix warning for static not at beginning
 ideapad_laptop: Add Lenovo G40-30 to devices without radio switch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVSTCfAAoJEKbMaAwKp364zysH/1J2y8Yg/gWIm6GKwtvA3riL
 0Q1QJFnMWSQ3f/ckXP33ZvCMEKC9nYZwxQfOKCC4VN73VvVzRgXsSWc7RNMN3Ukx
 qGs6agoNwBF4HlUTr/jiJmYz9yvumVwXo0LMZZWJhusOxOaLk5FraCLSgDySGZ5Q
 pl0qecFRk21KymRxIpEIOP3CsZRYY9KOi9A8vsuk1SphhKmG+nnLxwSLdWn+7GRT
 Iw/MgDINOqcQORrMmI3wQ0+w8beB2hcY3CiNqSmRsR6Bl2wXVuNjO/EKTgME61F/
 u209y6W/FVWRvg62TIWOGSwKmKZUTUId7+LxjqWL2uUJdfzU6E864mXY5C/ZHr0=
 =PZmH
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2015-05-05 18:14:04 -07:00
commit 3ce05a4e74
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/platform/x86/ideapad-laptop.c
View File

@ -829,6 +829,13 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
* report all radios as hardware-blocked.
*/
static const struct dmi_system_id no_hw_rfkill_list[] = {
{
.ident = "Lenovo G40-30",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
},
},
{
.ident = "Lenovo Yoga 2 11 / 13 / Pro",
.matches = {

2
drivers/platform/x86/thinkpad_acpi.c
View File

@ -2115,7 +2115,7 @@ static int hotkey_mask_get(void)
return 0;
}
void static hotkey_mask_warn_incomplete_mask(void)
static void hotkey_mask_warn_incomplete_mask(void)
{
/* log only what the user can fix... */
const u32 wantedmask = hotkey_driver_mask &