From patchwork Mon Aug 9 16:48:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 118425 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 o79GifZ7032657 for ; Mon, 9 Aug 2010 16:44:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757168Ab0HIQol (ORCPT ); Mon, 9 Aug 2010 12:44:41 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:48128 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757158Ab0HIQok (ORCPT ); Mon, 9 Aug 2010 12:44:40 -0400 Received: by bwz3 with SMTP id 3so1352926bwz.19 for ; Mon, 09 Aug 2010 09:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=mJPmmICRCBFIW7b3MJxfkTYFKMYDrRYg5+jlsv94HOA=; b=lOwSlwtAMwVEwcf7n1zofLlG1bn0TQyj2nk5LUMdSjIsyr+i7Ds4pA9f1rjxTq8axR fJj2sHWf4QIzRzQtVaPG9R8i+lUY/CFOTPnGRQSpkT3fJMPQclAl4FCTxExxDHE+Rryu SuGxmx9Eok3FewSH9xNnJo7qud3Ai+QgnTI/o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=P0qplvfBLO4XxZv96nUpI1Nag4Xg09Xa5R666q0NB2ezwnVX5VkhFmLNA/Yh+kovH7 DPJ+T9TIJned2m8ptoP8aSkFeONZuouoctPkbKz7Y4kN9OITGHDh/75GCCTVxhS05A17 g2pGU1J2Q1xvV9jbhjsIBD9jsXK0IXD3TBa/E= Received: by 10.204.175.74 with SMTP id w10mr10947119bkz.4.1281372279289; Mon, 09 Aug 2010 09:44:39 -0700 (PDT) Received: from [192.168.1.3] (p3EE03A42.dip.t-dialin.net [62.224.58.66]) by mx.google.com with ESMTPS id f18sm2601427bkf.15.2010.08.09.09.44.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 09 Aug 2010 09:44:38 -0700 (PDT) Subject: [PATCH] Input: xpad - add USB-ID for PL-3601 Xbox 360 pad From: Christoph Fritz To: Dmitry Torokhov Cc: linux-input Date: Mon, 09 Aug 2010 18:48:04 +0200 Message-ID: <1281372484.20805.56.camel@lovely.krouter> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 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]); Mon, 09 Aug 2010 16:44:42 +0000 (UTC) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 269a846..f9fb7fa 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -148,6 +148,7 @@ static const struct xpad_device { { 0x0e6f, 0x0005, "Eclipse wireless Controller", 0, XTYPE_XBOX }, { 0x0e6f, 0x0006, "Edge wireless Controller", 0, XTYPE_XBOX }, { 0x0e6f, 0x0006, "Pelican 'TSZ' Wired Xbox 360 Controller", 0, XTYPE_XBOX360 }, + { 0x0e6f, 0x0201, "Pelican PL-3601 'TSZ' Wired Xbox 360 Controller", 0, XTYPE_XBOX360 }, { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", 0, XTYPE_XBOX }, { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX }, { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },