Skip to content

Commit 5f92e58

Browse files
ibmthidcrowell77
authored andcommitted
SW354822: Fix for compile error due to multiple defination of getDimmType fn, wh
Change-Id: I0e8b7cc1651f291b9ac660061503c90be36b2827 CQ:SW354822 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25344 Reviewed-by: Thi N. Tran <thi@us.ibm.com> Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent 8f0b9fc commit 5f92e58

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/* permissions and limitations under the License. */
2323
/* */
2424
/* IBM_PROLOG_END_TAG */
25-
// $Id: getMBvpdSpareDramData.C,v 1.8 2015/12/16 16:23:45 janssens Exp $
25+
// $Id: getMBvpdSpareDramData.C,v 1.9 2016/06/03 11:41:23 thi Exp $
2626
#include <stdint.h>
2727

2828
// fapi support
@@ -41,7 +41,7 @@ using namespace fapi;
4141
* or ENUM_ATTR_SPD_CUSTOM_YES
4242
* @return ReturnCode
4343
*/
44-
fapi::ReturnCode getDimmType(const fapi::Target &i_tgtHandle,
44+
fapi::ReturnCode getDimmTypeFromSPD(const fapi::Target &i_tgtHandle,
4545
uint8_t &o_customDimm);
4646

4747

@@ -94,7 +94,7 @@ fapi::ReturnCode getMBvpdSpareDramData(const fapi::Target &i_mba,
9494
{
9595
uint8_t l_customDimm = 0;
9696

97-
l_rc = getDimmType(i_mba,l_customDimm);
97+
l_rc = getDimmTypeFromSPD(i_mba,l_customDimm);
9898
if(l_rc)
9999
{
100100
FAPI_ERR("getMBvpdSpareDramData: Read of Custom Dimm failed");
@@ -200,7 +200,7 @@ fapi::ReturnCode getMBvpdSpareDramData(const fapi::Target &i_mba,
200200

201201

202202

203-
fapi::ReturnCode getDimmType(const fapi::Target &i_tgtHandle,
203+
fapi::ReturnCode getDimmTypeFromSPD(const fapi::Target &i_tgtHandle,
204204
uint8_t &o_customDimm)
205205
{
206206
fapi::ReturnCode l_rc;

0 commit comments

Comments
 (0)