On Fri, Jan 30, 2015 at 10:39:52AM +0100, Jiri Slaby wrote: > From: Andreas Utterberg <[email protected]> > > This patch has been added to the 3.12 stable tree. If you have any > objections, please let us know. >
This set of asus-nb-wmi patches seem to be relevant to the 3.16 kernel as well. I'll queue them for the next release. Cheers, -- Luís > =============== > > commit c08db55fe1455202e4bcda416e88bbbc20700dc4 upstream. > > The 'asus-nb-wmi' WAPF parameter must be set to 4, so the internal Wireless > LAN device is operational. > > Signed-off-by: Andreas Utterberg <[email protected]> > Signed-off-by: Matthew Garrett <[email protected]> > Signed-off-by: Jiri Slaby <[email protected]> > --- > drivers/platform/x86/asus-nb-wmi.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/platform/x86/asus-nb-wmi.c > b/drivers/platform/x86/asus-nb-wmi.c > index 563f59efa669..ddf0eefd862c 100644 > --- a/drivers/platform/x86/asus-nb-wmi.c > +++ b/drivers/platform/x86/asus-nb-wmi.c > @@ -137,6 +137,15 @@ static struct dmi_system_id asus_quirks[] = { > }, > { > .callback = dmi_matched, > + .ident = "ASUSTeK COMPUTER INC. X550CA", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), > + DMI_MATCH(DMI_PRODUCT_NAME, "X550CA"), > + }, > + .driver_data = &quirk_asus_x401u, > + }, > + { > + .callback = dmi_matched, > .ident = "ASUSTeK COMPUTER INC. X55A", > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), > -- > 2.2.2 > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
