Merge commit '111c9ef' into bfgminer

driver-klondike.c

@@ -1071,7 +1071,7 @@ static void klondike_check_nonce(struct cgpu_info *klncgpu, KLIST *kitem)
 			klncgpu->drv->name, klncgpu->device_id, (int)(kline->wr.dev),
 			kline->wr.workid, (unsigned int)nonce);
 
-	//inc_hw_errors(klncgpu->thr[0]);
+	inc_hw_errors2(klncgpu->thr[0], NULL, &nonce);
 }
 
 // thread to keep looking for replies

miner.h

@@ -1314,7 +1314,7 @@ struct work {
 
 	// Allow devices to identify work if multiple sub-devices
 	// DEPRECATED: New code should be using multiple processors instead
-	unsigned char	subid;
+	int		subid;
 	
 	// Allow devices to timestamp work for their own purposes
 	struct timeval	tv_stamp;