From patchwork Thu Aug 12 09:31:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 119222 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7C9TXkY011546 for ; Thu, 12 Aug 2010 09:32:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753808Ab0HLJcM (ORCPT ); Thu, 12 Aug 2010 05:32:12 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:62580 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869Ab0HLJcM (ORCPT ); Thu, 12 Aug 2010 05:32:12 -0400 Received: by mail-ww0-f44.google.com with SMTP id 40so1297310wwj.1 for ; Thu, 12 Aug 2010 02:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=MYWUo8wQYB9Ri+ymK3dI0sCXnr58C6MHVKKOwhSJ06k=; b=dK9AkSQO+zXVlzrHRzdXF6eYBhZ5CtFLVGdn5yL0UkpLiQBDJZIffppVZfd20ydnOt hprUsgG2zQZ+L90OcVMVQ8/xxJt15M/SgIG9hi/9S/bx9Zd6LxUJOY7ug8vwPNMKrl5+ KdYjkauFoDYK306qkkJsF/85Hi/osO4QSzBEo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=tqBnkbuemIBlnV9qBhOpGlylQddUBtsLVEQhgc06lB/YBmforRup5GTCrw762dg7KB EVhaiVT9THlaIUZgSKV6BvMlSbLuR3NFElVCVe1EzAt/3HKJ33tgoc3zjnY53VKbFSh0 LTMMcV7B7OzABHTjA7nxobMhzHjKuQbGTtlVA= Received: by 10.216.50.73 with SMTP id y51mr17825033web.85.1281605531409; Thu, 12 Aug 2010 02:32:11 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id e8sm678968wej.22.2010.08.12.02.32.09 (version=SSLv3 cipher=RC4-MD5); Thu, 12 Aug 2010 02:32:10 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-input@vger.kernel.org Cc: Dmitry Torokhov Subject: [PATCH 3/4] atkbd: support binding to ps2mult devices Date: Thu, 12 Aug 2010 13:31:52 +0400 Message-Id: <1281605513-11586-4-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281605513-11586-1-git-send-email-dbaryshkov@gmail.com> References: <1281605513-11586-1-git-send-email-dbaryshkov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 12 Aug 2010 09:32:13 +0000 (UTC) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index d358ef8..156fe54 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -1113,6 +1113,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv) /* Fall through */ case SERIO_8042: + case SERIO_PS2MULT_T: if (serio->write) atkbd->write = true; break; @@ -1240,6 +1241,12 @@ static struct serio_device_id atkbd_serio_ids[] = { .id = SERIO_ANY, .extra = SERIO_ANY, }, + { + .type = SERIO_PS2MULT_T, + .proto = SERIO_ANY, + .id = SERIO_ANY, + .extra = SERIO_ANY, + }, { 0 } };