From patchwork Wed Oct 28 18:07:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Dreier X-Patchwork-Id: 56327 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9SI7eV3007066 for ; Wed, 28 Oct 2009 18:07:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752512AbZJ1SHe (ORCPT ); Wed, 28 Oct 2009 14:07:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752423AbZJ1SHe (ORCPT ); Wed, 28 Oct 2009 14:07:34 -0400 Received: from sj-iport-2.cisco.com ([171.71.176.71]:13797 "EHLO sj-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbZJ1SHd (ORCPT ); Wed, 28 Oct 2009 14:07:33 -0400 Authentication-Results: sj-iport-2.cisco.com; dkim=neutral (message not signed) header.i=none X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEAGQl6EqrR7H+/2dsb2JhbADCLZguhD8EgWE X-IronPort-AV: E=Sophos;i="4.44,641,1249257600"; d="scan'208";a="218830388" Received: from sj-core-2.cisco.com ([171.71.177.254]) by sj-iport-2.cisco.com with ESMTP; 28 Oct 2009 18:07:38 +0000 Received: from xbh-sjc-231.amer.cisco.com (xbh-sjc-231.cisco.com [128.107.191.100]) by sj-core-2.cisco.com (8.13.8/8.14.3) with ESMTP id n9SI7c6q014078; Wed, 28 Oct 2009 18:07:38 GMT Received: from xfe-sjc-212.amer.cisco.com ([171.70.151.187]) by xbh-sjc-231.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 28 Oct 2009 11:07:37 -0700 Received: from roland-conroe ([10.33.42.9]) by xfe-sjc-212.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 28 Oct 2009 11:07:37 -0700 Received: by roland-conroe (Postfix, from userid 33217) id 1A4CA1B648D; Wed, 28 Oct 2009 11:07:36 -0700 (PDT) From: Roland Dreier To: torvalds@linux-foundation.org, akpm@linux-foundation.org Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] please pull infiniband.git X-Message-Flag: Warning: May contain useful information Date: Wed, 28 Oct 2009 11:07:36 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.91 (gnu/linux) MIME-Version: 1.0 X-OriginalArrivalTime: 28 Oct 2009 18:07:37.0284 (UTC) FILETIME=[87F39040:01CA57F9] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 5dd7225..291a505 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c @@ -1282,6 +1282,7 @@ static struct pci_device_id mlx4_pci_table[] = { { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */ { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */ { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/ + { PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */ { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */ { 0, } };