From patchwork Wed Apr 21 14:24:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 93870 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3LEP07H020872 for ; Wed, 21 Apr 2010 14:25:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754896Ab0DUOY7 (ORCPT ); Wed, 21 Apr 2010 10:24:59 -0400 Received: from relay2-v.mail.gandi.net ([217.70.178.76]:55662 "EHLO relay2-v.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754610Ab0DUOY7 (ORCPT ); Wed, 21 Apr 2010 10:24:59 -0400 X-Originating-IP: 217.70.178.38 Received: from mfilter4-v.gandi.net (mfilter4-v.gandi.net [217.70.178.38]) by relay2-v.mail.gandi.net (Postfix) with ESMTP id 3BA3C135DA; Wed, 21 Apr 2010 16:24:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter4-v.gandi.net Received: from relay2-v.mail.gandi.net ([217.70.178.76]) by mfilter4-v.gandi.net (mfilter4-v.gandi.net [217.70.178.38]) (amavisd-new, port 10024) with ESMTP id VLwayucGQna2; Wed, 21 Apr 2010 16:24:57 +0200 (CEST) X-Originating-IP: 82.8.179.104 Received: from [192.168.1.134] (cpc1-glfd5-2-0-cust871.6-2.cable.virginmedia.com [82.8.179.104]) (Authenticated sender: hadess@hadess.net) by relay2-v.mail.gandi.net (Postfix) with ESMTPSA id 9CCCD135E3; Wed, 21 Apr 2010 16:24:57 +0200 (CEST) Subject: [PATCH] Add support for the Wacom Intuos 4 wireless From: Bastien Nocera To: linux-input@vger.kernel.org Cc: Jiri Kosina Date: Wed, 21 Apr 2010 15:24:56 +0100 Message-ID: <1271859896.1960.8.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.29.91 (2.29.91-1.fc13) 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]); Wed, 21 Apr 2010 14:25:00 +0000 (UTC) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b57e5f7..c0bf99a 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1360,6 +1360,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 66a2ca8..21f360f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -456,6 +456,7 @@ #define USB_VENDOR_ID_WACOM 0x056a #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81 +#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH 0xbd #define USB_VENDOR_ID_WISEGROUP 0x0925 #define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005 diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 8d3b46f..91dbae3 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -256,7 +256,7 @@ static void wacom_remove(struct hid_device *hdev) static const struct hid_device_id wacom_devices[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) }, - + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) }, { } }; MODULE_DEVICE_TABLE(hid, wacom_devices);