Re: [PATCH 01/14] MAINTAINERS: update drivers/platform/x86 information

[Len Brown <lenb@kernel.org>]

thanks,
Len Brown, Intel Open Source Technology Center

On Mon, 1 Mar 2010, Matthew Garrett wrote:

> On Mon, Mar 01, 2010 at 12:59:03PM -0500, Len Brown wrote:
> 
> > Matthew,
> > Unless you object, I'll send Corentin's asus-laptop cleanup
> > upstream with my treek.
> 
> I've just pulled this in (along with a couple of other minor fixes) - 
> I'm just waiting to make sure I get the right set of Thinkpad fixes 
> before sending another pull request.

excellent.

please pick up this one too, and I'll delete my asus branch.

thanks,
-Len


>From 6204ff7f967d68b6c3b830b6df2cf2a3081b77a8 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 2 Feb 2010 14:37:57 -0800
Subject: [PATCH] asus-acpi: remove duplicate comparison of asus_model strings
X-Patchwork-Hint: ignore

These tests already occur elsewhere

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/platform/x86/asus_acpi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index c1d2aee..1381430 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/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;
-- 
1.7.0.87.g0901d