From patchwork Tue Aug 31 16:10:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 145251 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 o7VGAu4D007940 for ; Tue, 31 Aug 2010 16:11:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752685Ab0HaQKb (ORCPT ); Tue, 31 Aug 2010 12:10:31 -0400 Received: from qmta05.westchester.pa.mail.comcast.net ([76.96.62.48]:51391 "EHLO qmta05.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587Ab0HaQK2 (ORCPT ); Tue, 31 Aug 2010 12:10:28 -0400 Received: from omta06.westchester.pa.mail.comcast.net ([76.96.62.51]) by qmta05.westchester.pa.mail.comcast.net with comcast id 0yNF1f00216LCl0554ATDd; Tue, 31 Aug 2010 16:10:27 +0000 Received: from hal.comcast.net ([75.69.247.31]) by omta06.westchester.pa.mail.comcast.net with comcast id 14AT1f00E0hNrtn3S4AT5f; Tue, 31 Aug 2010 16:10:27 +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 o7VGAWxP002602; Tue, 31 Aug 2010 12:10:37 -0400 Received: (from hnrose@localhost) by hal.comcast.net (8.14.3/8.14.3/Submit) id o7VGAH1B002569; Tue, 31 Aug 2010 12:10:17 -0400 Date: Tue, 31 Aug 2010 12:10:17 -0400 From: Hal Rosenstock To: sashak@voltaire.com Cc: linux-rdma@vger.kernel.org Subject: [PATCHv2] opensm/include/osm_helper.h: Eliminate some duplicate declarations Message-ID: <20100831161017.GC2557@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 16:11:14 +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