Merge branch 'ztex_S_noauto' into dev_x6500

Conflicts:
	miner.c

miner.c

@@ -69,10 +69,10 @@
 #include "scrypt.h"
 #endif
 
-#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_MODMINER)
+#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_MODMINER) || defined(USE_ZTEX)
 #	define USE_FPGA
 #	define USE_FPGA_SERIAL
-#elif defined(USE_ZTEX) || defined(USE_X6500)
+#elif defined(USE_X6500)
 #	define USE_FPGA
 #endif