From patchwork Fri Jan 9 21:31:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ron Mercer X-Patchwork-Id: 17610 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 8690FDE15B for ; Sat, 10 Jan 2009 08:32:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757752AbZAIVcO (ORCPT ); Fri, 9 Jan 2009 16:32:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757232AbZAIVcL (ORCPT ); Fri, 9 Jan 2009 16:32:11 -0500 Received: from avexch1.qlogic.com ([198.70.193.115]:58231 "EHLO avexch1.qlogic.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758026AbZAIVcD (ORCPT ); Fri, 9 Jan 2009 16:32:03 -0500 Received: from linux-7mw0.qlogic.com ([172.17.161.156]) by avexch1.qlogic.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 9 Jan 2009 13:31:11 -0800 Received: by linux-7mw0.qlogic.com (Postfix, from userid 1000) id 72C913D87C; Fri, 9 Jan 2009 13:31:53 -0800 (PST) From: Ron Mercer To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-driver@qlogic.com, ron.mercer@qlogic.com Subject: [PATCH 3/5] qlge: Remove support for device ID 8000. Date: Fri, 9 Jan 2009 13:31:51 -0800 Message-Id: <1231536713-24538-3-git-send-email-ron.mercer@qlogic.com> X-Mailer: git-send-email 1.6.0 In-Reply-To: <20090109213045.GD10803@susedev.qlogic.org> References: <20090109213045.GD10803@susedev.qlogic.org> X-OriginalArrivalTime: 09 Jan 2009 21:31:11.0094 (UTC) FILETIME=[97541160:01C972A1] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Support for dev id 8000 is pushed out until 2.6.30. Signed-off-by: Ron Mercer --- drivers/net/qlge/qlge.h | 3 +-- drivers/net/qlge/qlge_main.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 9697002..a509534 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h @@ -28,8 +28,7 @@ } while (0) #define QLGE_VENDOR_ID 0x1077 -#define QLGE_DEVICE_ID1 0x8012 -#define QLGE_DEVICE_ID 0x8000 +#define QLGE_DEVICE_ID 0x8012 #define MAX_RX_RINGS 128 #define MAX_TX_RINGS 128 diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index f9db7a8..e5a6238 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -76,7 +76,6 @@ MODULE_PARM_DESC(irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy."); static struct pci_device_id qlge_pci_tbl[] __devinitdata = { {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID)}, - {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID1)}, /* required last entry */ {0,} };