Semi-Merge commit 'c9cc744' into cg_merges_20130602 · 51ff9816fd - THC的仓库

Semi-Merge commit 'c9cc744' into cg_merges_20130602

Conflicts:
	driver-bflsc.c
	miner.h

Luke Dashjr 12 years ago

parent

af7c8bc9f2 c9cc7445e5

commit

51ff9816fd

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
miner.h
							 
								View File
							
				@@ -437,7 +437,7 @@ struct cgpu_info {
			
				 	struct cgpu_info *next_proc;
			
				 	const char *device_path;
			
				-	FILE *device_file;
			
				+	void *device_data;
			
				 	union {
			
				 #ifdef USE_ZTEX
			
				 		struct libztex_device *device_ztex;