From 70ef62c89b7f8ef37369c3fc1e3b86c251de165c Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Wed, 6 Jan 2010 22:07:41 +0100 Subject: [PATCH] --- yaml --- r: 179659 b: refs/heads/master c: 4194e2f551a6308e6ab34ac88210bf54858aa7df h: refs/heads/master i: 179657: 1a62b8031e16ec131816b33fd153dfb5113fa677 179655: e6787f7aa18dbb27ad705b9dee03ac6774f8374f v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/eeepc-laptop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 08f01984607c..8e8ed3594464 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 322a1356be96bcc4b97e8e370f6468c821330077 +refs/heads/master: 4194e2f551a6308e6ab34ac88210bf54858aa7df diff --git a/trunk/drivers/platform/x86/eeepc-laptop.c b/trunk/drivers/platform/x86/eeepc-laptop.c index a959abdea3a7..e2be6bb33d92 100644 --- a/trunk/drivers/platform/x86/eeepc-laptop.c +++ b/trunk/drivers/platform/x86/eeepc-laptop.c @@ -1277,7 +1277,7 @@ static void eeepc_dmi_check(struct eeepc_laptop *eeepc) * hotplug code. In fact, current hotplug code seems to unplug another * device... */ - if (strcmp(model, "1005HA") == 0) { + if (strcmp(model, "1005HA") == 0 || strcmp(model, "1201N") == 0) { eeepc->hotplug_disabled = true; pr_info("wlan hotplug disabled\n"); }