Message ID | 20200601174020.748589900@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6005C433DF for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:54:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C711206C3 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037695; bh=aW1gOOs4HbyBdM6yTnX+lhvxry2Uif7eLZDEZKmV2NQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t4ZipH/296FepA/LdwzaEjWMr5NF5PQcAwXup2w9nsM6srqoEaSY92vUl1Twt4rMY wkQf6B8U/4l+P7o6p8PObKio9mcFG2xxolwHZYoIZSBSdNvC9a7FN41SWJwNbgKPb0 lE3xeWpYAmqO27N+TbOWnbMsIHiQpdOUpuOjQOEY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728636AbgFASyv (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 14:54:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:44868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728688AbgFASBu (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 14:01:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 98A752065C; Mon, 1 Jun 2020 18:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034510; bh=aW1gOOs4HbyBdM6yTnX+lhvxry2Uif7eLZDEZKmV2NQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g06DTov0Ud8ToNmasrv0+omGipAPYauPXsejOuALWgbQZoRggGEJK7u5WOwIEkkz/ MznzhchxRgrpBxsxCrSmR9md3pgE+4FS4hrn6v9ShhtWOltRABIjBQi9IzdYYD2JcF 7yd9lVSh3jAamYgasZafra94rSUYxxFSk4981/x8= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, James Hilliard <james.hilliard1@gmail.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.14 24/77] Input: usbtouchscreen - add support for BonXeon TP Date: Mon, 1 Jun 2020 19:53:29 +0200 Message-Id: <20200601174020.748589900@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174016.396817032@linuxfoundation.org> References: <20200601174016.396817032@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index 2c41107240de..499402a975b3 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c @@ -197,6 +197,7 @@ static const struct usb_device_id usbtouch_devices[] = { #endif #ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH + {USB_DEVICE(0x255e, 0x0001), .driver_info = DEVTYPE_IRTOUCH}, {USB_DEVICE(0x595a, 0x0001), .driver_info = DEVTYPE_IRTOUCH}, {USB_DEVICE(0x6615, 0x0001), .driver_info = DEVTYPE_IRTOUCH}, {USB_DEVICE(0x6615, 0x0012), .driver_info = DEVTYPE_IRTOUCH_HIRES},