From 5de4c5ec41bf05f8e3d735ded4cc864d017e6279 Mon Sep 17 00:00:00 2001
From: Mark Pizzutillo <Mark.Pizzutillo@ibm.com>
Date: Mon, 13 May 2019 16:14:38 -0400
Subject: Fix memdiags to fix jenkins

build-fix

Change-Id: I6bd82232a5c182ddd5aab31af6122911c4392b3a
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77303
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77312
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
---
 .../chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C       | 4 ++--
 .../chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.mk      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C
index cae8b54c0..9112f2efe 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C
@@ -35,8 +35,8 @@
 
 #include <fapi2.H>
 #include <exp_mss_memdiag.H>
-
-#include <chips/ocmb/explorer/procedures/hwp/memory/lib/dimm/exp_rank.H>
+#include <lib/shared/exp_defaults.H>
+#include <lib/dimm/exp_rank.H>
 #include <generic/memory/lib/utils/poll.H>
 #include <generic/memory/lib/utils/find.H>
 #include <generic/memory/lib/utils/count_dimm.H>
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.mk b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.mk
index 50b4933a1..32649e24e 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.mk
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.mk
@@ -24,7 +24,8 @@
 # IBM_PROLOG_END_TAG
 
 # Include the macros and things for MSS procedures
+-include 00exp_common.mk
 
 PROCEDURE=exp_mss_memdiag
-$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
+$(eval $(call ADD_EXP_MEMORY_INCDIRS,$(PROCEDURE)))
 $(call BUILD_PROCEDURE)
-- 
cgit v1.2.1