Skip to content
Permalink
Browse files

conflict resolve

  • Loading branch information...
quickwritereader committed Jun 5, 2019
1 parent d0c3543 commit 148c4cc5fd4db4d10dcda94c5640de12611b7669
Showing with 1 addition and 1 deletion.
  1. +1 −1 kernel/power/KERNEL.POWER9
@@ -42,7 +42,7 @@ ZGEMMKERNEL = zgemm_kernel_power9.S
ZGEMMONCOPY = ../generic/zgemm_ncopy_2.c
ZGEMMOTCOPY = ../generic/zgemm_tcopy_2.c
ZGEMMINCOPY = ../generic/zgemm_ncopy_8.c
ZGEMMITCOPY = ../generic/zgemm_tcopy_8.c
ZGEMMITCOPY = zgemm_tcopy_8_power8.S
ZGEMMONCOPYOBJ = zgemm_oncopy.o
ZGEMMOTCOPYOBJ = zgemm_otcopy.o
ZGEMMINCOPYOBJ = zgemm_incopy.o

0 comments on commit 148c4cc

Please sign in to comment.
You can’t perform that action at this time.