conflict resolve

diff --git a/kernel/power/KERNEL.POWER9 b/kernel/power/KERNEL.POWER9
index 126313c..0f91d6d 100644 (file)
--- a/kernel/power/KERNEL.POWER9
+++ b/kernel/power/KERNEL.POWER9
@@ -42,7 +42,7 @@ ZGEMMKERNEL    = zgemm_kernel_power9.S
 ZGEMMONCOPY    = ../generic/zgemm_ncopy_2.c\r
 ZGEMMOTCOPY    = ../generic/zgemm_tcopy_2.c\r
 ZGEMMINCOPY    = ../generic/zgemm_ncopy_8.c\r
-ZGEMMITCOPY    =  ../generic/zgemm_tcopy_8.c\r
+ZGEMMITCOPY    = zgemm_tcopy_8_power8.S\r
 ZGEMMONCOPYOBJ =  zgemm_oncopy.o\r
 ZGEMMOTCOPYOBJ =  zgemm_otcopy.o\r
 ZGEMMINCOPYOBJ =  zgemm_incopy.o\r