fix merge

include/starpu_task.h

@@ -395,6 +395,21 @@ struct starpu_codelet
 	*/
 	starpu_cuda_func_t cuda_funcs[STARPU_MAXIMPLEMENTATIONS];
 
+          /**
+           Optional array of function pointers to the FPGA
+           implementations of the codelet. The functions prototype
+           must be:
+           \code{.c}
+           void fpga_func(void *buffers[], void *cl_arg)
+           \endcode
+           The first argument being the array of data managed by the
+           data management library, and the second argument is a
+           pointer to the argument passed from the field
+           starpu_task::cl_arg. If the field starpu_codelet::where is
+           set, then the field starpu_codelet::fpga_funcs is ignored if
+           ::STARPU_FPGA does not appear in the field
+           starpu_codelet::where, it must be non-<c>NULL</c> otherwise.
+        */
 
 	starpu_fpga_func_t fpga_funcs[STARPU_MAXIMPLEMENTATIONS];
 
@@ -467,7 +482,9 @@ struct starpu_codelet
 	*/
 	const char *cpu_funcs_name[STARPU_MAXIMPLEMENTATIONS];
 
-	char *fpga_funcs_name[STARPU_MAXIMPLEMENTATIONS];
+	/** 
+	 fpga kernel type
+        */
 
 	char *fpga_kernel_type[STARPU_MAXIMPLEMENTATIONS];