fix merge

include/starpu_worker.h

@@ -46,11 +46,11 @@ enum starpu_node_kind
 	STARPU_UNUSED=0,
 	STARPU_CPU_RAM=1,
 	STARPU_CUDA_RAM=2,
-        STARPU_FPGA_RAM=4,
 	STARPU_OPENCL_RAM=3,
 	STARPU_DISK_RAM=4,
 	STARPU_MIC_RAM=5,
-	STARPU_MPI_MS_RAM=6
+	STARPU_FPGA_RAM=6,
+	STARPU_MPI_MS_RAM=7
 };
 
 /**