On Tue, Feb 2, 2010 at 11:37 PM, <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > From: Roel Kluin <roel.kluin@xxxxxxxxx> > > These tests already occur elsewhere > > Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> > Cc: Corentin Chary <corentincj@xxxxxxxxxx> > Cc: Karol Kozimor <sziwan@xxxxxxxxxxxxxxxxxxxxx> > Cc: Len Brown <lenb@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > drivers/platform/x86/asus_acpi.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff -puN drivers/platform/x86/asus_acpi.c~asus-acpi-remove-duplicate-comparison-of-asus_model-strings drivers/platform/x86/asus_acpi.c > --- a/drivers/platform/x86/asus_acpi.c~asus-acpi-remove-duplicate-comparison-of-asus_model-strings > +++ a/drivers/platform/x86/asus_acpi.c > @@ -1225,9 +1225,8 @@ static int asus_model_match(char *model) > else if (strncmp(model, "M2N", 3) == 0 || > strncmp(model, "M3N", 3) == 0 || > strncmp(model, "M5N", 3) == 0 || > - strncmp(model, "M6N", 3) == 0 || > strncmp(model, "S1N", 3) == 0 || > - strncmp(model, "S5N", 3) == 0 || strncmp(model, "W1N", 3) == 0) > + strncmp(model, "S5N", 3) == 0) > return xxN; > else if (strncmp(model, "M1", 2) == 0) > return M1A; > _ > Ack, Roel, are you still using this driver ? Have you a good reason to use it instead of asus-laptop ? -- Corentin Chary http://xf.iksaif.net -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
