P4 to Git Change 1084700 by ericz@fl_ericz3 on 2014/10/06 18:17:12

EPR #365147 - OGL - VI Bringup Support

	Change include of si_ci_merged header to si_ci_vi_merged header since the si_ci ones are out of date and will be removed shortly.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/5980/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuscsi.cpp#25 edit

rocclr/runtime/device/gpu/gpuscsi.cpp

@@ -7,7 +7,7 @@
 #include "device/gpu/gpukernel.hpp"
 #include "acl.h"
 #include "SCShadersSi.h"
-#include "si_ci_merged_offset.h"
+#include "si_ci_vi_merged_offset.h"
 #include <string>
 #include <fstream>
 #include <sstream>