From patchwork Tue Aug 31 18:20:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 145361 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7VIMY4A003947 for ; Tue, 31 Aug 2010 18:22:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754867Ab0HaSWP (ORCPT ); Tue, 31 Aug 2010 14:22:15 -0400 Received: from qmta02.westchester.pa.mail.comcast.net ([76.96.62.24]:53561 "EHLO qmta02.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754864Ab0HaSWO (ORCPT ); Tue, 31 Aug 2010 14:22:14 -0400 Received: from omta05.westchester.pa.mail.comcast.net ([76.96.62.43]) by qmta02.westchester.pa.mail.comcast.net with comcast id 10JZ1f0070vyq2s526NEo9; Tue, 31 Aug 2010 18:22:14 +0000 Received: from hal.comcast.net ([75.69.247.31]) by omta05.westchester.pa.mail.comcast.net with comcast id 16NE1f0060hNrtn3R6NERF; Tue, 31 Aug 2010 18:22:14 +0000 Received: from hal.comcast.net (localhost.localdomain [127.0.0.1]) by hal.comcast.net (8.14.3/8.14.3) with ESMTP id o7VIMIpN004763; Tue, 31 Aug 2010 14:22:23 -0400 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id o7VIKgaQ004722; Tue, 31 Aug 2010 14:20:42 -0400 Date: Tue, 31 Aug 2010 14:20:42 -0400 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCHv3] opensm/include/osm_helper.h: Eliminate some duplicate declarations Message-ID: <20100831182041.GA4718@comcast.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 31 Aug 2010 18:22:34 +0000 (UTC) diff --git a/opensm/include/opensm/osm_helper.h b/opensm/include/opensm/osm_helper.h index 1a10cde..9abbd61 100644 --- a/opensm/include/opensm/osm_helper.h +++ b/opensm/include/opensm/osm_helper.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. - * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved. + * Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * @@ -493,10 +493,6 @@ const char *osm_get_mtu_str(IN uint8_t mtu); const char *osm_get_lwa_str(IN uint8_t lwa); -const char *osm_get_mtu_str(IN uint8_t mtu); - -const char *osm_get_lwa_str(IN uint8_t lwa); - const char *osm_get_lsa_str(IN uint8_t lsa); /****f* IBA Base: Types/osm_get_sm_mgr_signal_str