From patchwork Wed Nov 16 18:37:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 126010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5002EB71A4 for ; Thu, 17 Nov 2011 05:37:26 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RQkMD-0007my-Ok; Wed, 16 Nov 2011 18:37:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RQkMB-0007mq-Mn for kernel-team@lists.ubuntu.com; Wed, 16 Nov 2011 18:37:11 +0000 Received: from c-24-22-13-22.hsd1.or.comcast.net ([24.22.13.22] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RQkMB-00026e-BJ for kernel-team@lists.ubuntu.com; Wed, 16 Nov 2011 18:37:11 +0000 From: Chase Douglas To: kernel-team@lists.ubuntu.com Subject: [Oneiric][PATCH 1/3] Revert "UBUNTU: SAUCE: HID: hid-ntrig: add support for 1b96:0006 model" Date: Wed, 16 Nov 2011 10:37:01 -0800 Message-Id: <1321468623-7847-2-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321468623-7847-1-git-send-email-chase.douglas@canonical.com> References: <1321468623-7847-1-git-send-email-chase.douglas@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Prepare for switching back to the more generic upstream version. BugLink: https://bugs.launchpad.net/bugs/724831 This reverts commit 1246262b65345ebe4644d6e230f2139ee5f6403a. Signed-off-by: Chase Douglas --- drivers/hid/hid-ntrig.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index e8207fb..5d3a051 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -526,7 +526,6 @@ static void ntrig_remove(struct hid_device *hdev) static const struct hid_device_id ntrig_devices[] = { NTRIG_DEVICE(0x0001), - NTRIG_DEVICE(0x0006), { } }; MODULE_DEVICE_TABLE(hid, ntrig_devices);