Merge branch 'uniscan' into bfgminer

miner.c

@@ -889,7 +889,7 @@ char *set_request_diff(const char *arg, float *p)
 
 extern struct lowlevel_device_info *_vcom_devinfo_findorcreate(struct lowlevel_device_info **, const char *);
 
-#ifdef FPGAUTILS_H
+#ifdef HAVE_FPGAUTILS
 #ifdef WIN32
 void _vcom_devinfo_scan_querydosdevice(struct lowlevel_device_info ** const devinfo_list)
 {